From e31dea3d14e72a445db2c9b22f4ea005c36a5c85 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 17 Jan 2023 04:17:17 +0000 Subject: [PATCH 001/117] python3Packages.parsimonious: disable benchmark tests that may fail This fixes ``` =================================== FAILURES =================================== ______________________ TestBenchmarks.test_lists_vs_dicts ______________________ self = def test_lists_vs_dicts(self): """See what's faster at int key lookup: dicts or lists.""" list_time = timeit('item = l[9000]', 'l = [0] * 10000') dict_time = timeit('item = d[9000]', 'd = {x: 0 for x in range(10000)}') # Dicts take about 1.6x as long as lists in Python 2.6 and 2.7. > self.assertTrue(list_time < dict_time, '%s < %s' % (list_time, dict_time)) E AssertionError: False is not true : 0.051286615896970034 < 0.0440241270698607 parsimonious/tests/test_benchmarks.py:16: AssertionError =========================== short test summary info ============================ FAILED parsimonious/tests/test_benchmarks.py::TestBenchmarks::test_lists_vs_dicts =================== 1 failed, 82 passed, 2 skipped in 1.19s ==================== ``` --- pkgs/development/python-modules/parsimonious/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index f22b1b605e34..c6e25161e37e 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -26,6 +26,14 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test_benchmarks.py tests are actually benchmarks and may fail due to + # something being unexpectedly slow on a heavily loaded build machine + "test_lists_vs_dicts" + "test_call_vs_inline" + "test_startswith_vs_regex" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "regex>=2022.3.15" "regex" From 95c17b8e72da5b9b668a6fa69cc6ee73151b8d8d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 6 Dec 2022 23:05:03 +0100 Subject: [PATCH 002/117] lout: 3.40 -> 3.42.2 https://github.com/william8000/lout/blob/3.42.2/whatsnew#L621 It seems that lout is now maintained on GitHub: https://lists.nongnu.org/archive/html/lout-users/2021-04/msg00001.html The recent changes made to the repository seems to be reasonable: https://github.com/william8000/lout/commits/3.42.2 Comparing the content of svn://svn.savannah.nongnu.org/lout/tags/3.39 with the `3.39` tag in the GitHub repo shows no significant differences. --- .../CVE-2019-19917-and-CVE-2019-19918.patch | 95 ------------------- pkgs/tools/typesetting/lout/builder.sh | 43 --------- pkgs/tools/typesetting/lout/default.nix | 30 ++---- 3 files changed, 10 insertions(+), 158 deletions(-) delete mode 100644 pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch delete mode 100755 pkgs/tools/typesetting/lout/builder.sh diff --git a/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch b/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch deleted file mode 100644 index b146822c9c51..000000000000 --- a/pkgs/tools/typesetting/lout/CVE-2019-19917-and-CVE-2019-19918.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/externs.h -+++ b/externs.h -@@ -260,6 +260,9 @@ If you're compiling this, you've got the - /* that can appear correctly on one page. Can be */ - /* increased to any small positive integer. */ - /* */ -+/* MAX_FORMAT The maximum number of characters for sscanf formats */ -+/* for splitting strings with tab-delimited fields. */ -+/* */ - /*****************************************************************************/ - - #define MAX_FULL_LENGTH 8388607 /* 2**23 - 1, about 148 metres */ -@@ -275,6 +278,7 @@ If you're compiling this, you've got the - #define MAX_LEX_STACK 20 - #define MAX_CHARS 256 - #define MAX_HCOPIES 3 -+#define MAX_FORMAT 100 - - /*****************************************************************************/ - /* */ ---- a/z02.c -+++ b/z02.c -@@ -378,7 +378,7 @@ static void srcnext(void) - if( blksize != 0 && chpt < limit ) - { debugcond0(DLA, DD, stack_free <= 1, "srcnext: transferring."); - col = buf; -- while( chtbl[(*--col = *--limit)] != NEWLINE ); -+ while( col > mem_block && chtbl[(*--col = *--limit)] != NEWLINE ); - frst = col + 1; limit++; blksize = 0; - } - ---- a/z33.c -+++ b/z33.c -@@ -847,6 +847,7 @@ BOOLEAN DbRetrieve(OBJECT db, BOOLEAN ga - BOOLEAN DbRetrieveNext(OBJECT db, BOOLEAN *gall, OBJECT *sym, FULL_CHAR *tag, - FULL_CHAR *seq, FILE_NUM *dfnum, long *dfpos, int *dlnum, long *cont) - { FULL_CHAR line[MAX_BUFF], *cline, fname[MAX_BUFF]; int symnum; -+ char format[MAX_FORMAT]; - ifdebug(DPP, D, ProfileOn("DbRetrieveNext")); - debug2(DBS, DD, "DbRetrieveNext( %s, %ld )", string(db), *cont); - assert(reading(db), "DbRetrieveNext: not reading"); -@@ -858,6 +859,8 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - return FALSE; - } - -+ sprintf(format, "%%d&%%%d[^\t]\t%%%d[^\t]\t%%*[^\t]\t%%ld\t%%d\t%%%d[^\n\f]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); -+ - if( in_memory(db) ) - { - /* get next entry from internal database */ -@@ -868,7 +871,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - } - cline = (FULL_CHAR *) db_lines(db)[*cont]; - *gall = (cline[0] == '0' ? 1 : 0); -- sscanf((char *)&cline[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", -+ sscanf((char *)&cline[*gall], format, - &symnum, tag, seq, dfpos, dlnum, fname); - *cont = *cont + 1; - } -@@ -882,7 +885,7 @@ BOOLEAN DbRetrieveNext(OBJECT db, BOOLEA - return FALSE; - } - *gall = (line[0] == '0' ? 1 : 0); -- sscanf((char *)&line[*gall], "%d&%[^\t]\t%[^\t]\t%*[^\t]\t%ld\t%d\t%[^\n\f]", -+ sscanf((char *)&line[*gall], format, - &symnum, tag, seq, dfpos, dlnum, fname); - *cont = ftell(db_filep(db)); - } ---- a/z39.c -+++ b/z39.c -@@ -79,11 +79,13 @@ int strcollcmp(char *a, char *b) - int strcollcmp(char *a, char *b) - { char a1[MAX_BUFF], a2[MAX_BUFF], a3[MAX_BUFF]; - char b1[MAX_BUFF], b2[MAX_BUFF], b3[MAX_BUFF]; -+ char format[MAX_FORMAT]; - int order; -+ sprintf(format, "%%%d[^\t]\t%%%d[^\t]\t%%%d[^\t]", MAX_BUFF-1, MAX_BUFF-1, MAX_BUFF-1); - a1[0] = a2[0] = a3[0] = '\0'; -- sscanf(a, "%[^\t]\t%[^\t]\t%[^\t]", a1, a2, a3); -+ sscanf(a, format, a1, a2, a3); - b1[0] = b2[0] = b3[0] = '\0'; -- sscanf(b, "%[^\t]\t%[^\t]\t%[^\t]", b1, b2, b3); -+ sscanf(b, format, b1, b2, b3); - order = strcoll(a1, b1); - if( order == 0 ) - { -@@ -251,7 +253,7 @@ FULL_CHAR *StringQuotedWord(OBJECT x) - *q++ = CH_QUOTE; - for( p = string(x); *p != '\0'; p++ ) - { -- for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0'; *q++ = *r++ ); -+ for( r = (FULL_CHAR *) quoted_string[*p]; *r != '\0' && q < &buff[MAX_BUFF-2]; *q++ = *r++ ); - } - *q++ = CH_QUOTE; - *q++ = '\0'; diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh deleted file mode 100755 index cd513337f6f3..000000000000 --- a/pkgs/tools/typesetting/lout/builder.sh +++ /dev/null @@ -1,43 +0,0 @@ -# Prepare a makefile specifying the appropriate output directories. -# -# Written by Ludovic Courtès . -if [ -e .attrs.sh ]; then source .attrs.sh; fi - -source "$stdenv/setup" || exit 1 - -nixMakefile="nix-makefile" - -# Build and install documentation, PS and PDF. -installDoc () -{ - echo "building and installing documentation..." - for doc in design expert slides user - do - echo "building \`$doc' document..." - if [ ! -f "doc/$doc/outfile.ps" ] - then - ( PATH="$PWD:$PATH" ; \ - cd "doc/$doc" && lout -r4 -o outfile.ps all ) \ - || return 1 - fi - cp "doc/$doc/outfile.ps" "$out/doc/lout/$doc.ps" && \ - ps2pdf -dPDFSETTINGS=/prepress -sPAPERSIZE=a4 \ - "doc/$doc/outfile.ps" "$out/doc/lout/$doc.pdf" - done - - return 0 -} - -unpackPhase && \ -cd lout-*.* && \ -cat makefile | \ - sed -e "s|^PREFIX[[:blank:]]*=.*\$|PREFIX = $out|g ; \ - s|^LOUTLIBDIR[[:blank:]]*=.*$|LOUTLIBDIR = \$(PREFIX)/lib/lout|g ; \ - s|^LOUTDOCDIR[[:blank:]]*=.*$|LOUTDOCDIR = \$(PREFIX)/doc/lout|g ; \ - s|^MANDIR[[:blank:]]*=.*$|MANDIR = \$(PREFIX)/man|g" \ - > "$nixMakefile" && \ -mkdir -p "$out/bin" && mkdir -p "$out/lib" \ -mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" CC=cc install installman && \ -installDoc && \ -fixupPhase diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index f5bf22c0f338..ce3917a92808 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,27 +1,19 @@ -{lib, stdenv, fetchurl, ghostscript}: +{lib, stdenv, fetchFromGitHub, ghostscript}: stdenv.mkDerivation rec { pname = "lout"; - version = "3.40"; + version = "3.42.2"; - src = fetchurl { - urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" - "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! - "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out - # XXX: We could add the CTAN mirrors - # (see https://www.ctan.org/tex-archive/support/lout/). - ]; - sha256 = "1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"; + src = fetchFromGitHub { + owner = "william8000"; + repo = pname; + rev = version; + hash = "sha256-rzCRxmwppBno6o4RM2GjE0pe/5yvyzyo375XdfX04As="; }; - patches = [ - # https://build.opensuse.org/request/show/843612 - ./CVE-2019-19917-and-CVE-2019-19918.patch - ]; - buildInputs = [ ghostscript ]; - builder = ./builder.sh; + + makeFlags = [ "PREFIX=$(out)/" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { description = "Document layout system similar in style to LaTeX"; @@ -46,9 +38,7 @@ stdenv.mkDerivation rec { went back to the beginning. ''; - # Author's page: http://jeffreykingston.id.au/lout/ - # Wiki: https://sourceforge.net/p/lout/wiki/ - homepage = "https://savannah.nongnu.org/projects/lout/"; + homepage = "https://github.com/william8000/lout"; license = lib.licenses.gpl3Plus; From f388236ab2b1c8b25220492e8774bdf3de69ce3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Feb 2023 11:43:08 +0000 Subject: [PATCH 003/117] python310Packages.sentry-sdk: 1.15.0 -> 1.16.0 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d81b055036c9..45834b88b8bf 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-xUDMi2xoRMsDDe7LcQxIxxozo8vV5ZPzZp5zmNld3ew="; + hash = "sha256-hJ6OikRro9YUEX8rqMs/JkTvM9aTabEj4E8iNQ71gEc="; }; propagatedBuildInputs = [ From b7d8c4630206d113c8cbe22d0ff80be5189a7655 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 17:49:13 +0100 Subject: [PATCH 004/117] haskellPackages.ghc: 9.2.6 -> 9.2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.haskell.org/ghc/blog/20230227-ghc-9.2.7-released.html Also updates some of the printouts in the manual. We should probably make it clear in the text that these may be outdated, since we are doing a terrible job keeping up… --- doc/languages-frameworks/haskell.section.md | 24 ++++++++++++--------- pkgs/top-level/haskell-packages.nix | 4 ++-- pkgs/top-level/release-haskell.nix | 6 +++--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index c6d85a240a90..ec123e7c7bac 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -71,8 +71,10 @@ $ nix-env -f '' -qaP -A haskell.compiler haskell.compiler.ghc810 ghc-8.10.7 haskell.compiler.ghc88 ghc-8.8.4 haskell.compiler.ghc90 ghc-9.0.2 -haskell.compiler.ghc92 ghc-9.2.4 +haskell.compiler.ghc924 ghc-9.2.4 haskell.compiler.ghc925 ghc-9.2.5 +haskell.compiler.ghc926 ghc-9.2.6 +haskell.compiler.ghc92 ghc-9.2.7 haskell.compiler.ghc942 ghc-9.4.2 haskell.compiler.ghc943 ghc-9.4.3 haskell.compiler.ghc94 ghc-9.4.4 @@ -86,13 +88,15 @@ haskell.compiler.ghc924Binary ghc-binary-9.2.4 haskell.compiler.ghc924BinaryMinimal ghc-binary-9.2.4 haskell.compiler.integer-simple.ghc810 ghc-integer-simple-8.10.7 haskell.compiler.integer-simple.ghc8107 ghc-integer-simple-8.10.7 -haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4 haskell.compiler.integer-simple.ghc88 ghc-integer-simple-8.8.4 +haskell.compiler.integer-simple.ghc884 ghc-integer-simple-8.8.4 haskell.compiler.native-bignum.ghc90 ghc-native-bignum-9.0.2 haskell.compiler.native-bignum.ghc902 ghc-native-bignum-9.0.2 -haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.4 haskell.compiler.native-bignum.ghc924 ghc-native-bignum-9.2.4 haskell.compiler.native-bignum.ghc925 ghc-native-bignum-9.2.5 +haskell.compiler.native-bignum.ghc926 ghc-native-bignum-9.2.6 +haskell.compiler.native-bignum.ghc92 ghc-native-bignum-9.2.7 +haskell.compiler.native-bignum.ghc927 ghc-native-bignum-9.2.7 haskell.compiler.native-bignum.ghc942 ghc-native-bignum-9.4.2 haskell.compiler.native-bignum.ghc943 ghc-native-bignum-9.4.3 haskell.compiler.native-bignum.ghc94 ghc-native-bignum-9.4.4 @@ -105,15 +109,15 @@ Each of those compiler versions has a corresponding attribute set built using it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc924`: +for `haskell.packages.ghc927`: ```console -$ nix-env -f '' -qaP -A haskell.packages.ghc924 -haskell.packages.ghc924.a50 a50-0.5 -haskell.packages.ghc924.AAI AAI-0.2.0.1 -haskell.packages.ghc924.aasam aasam-0.2.0.0 -haskell.packages.ghc924.abacate abacate-0.0.0.0 -haskell.packages.ghc924.abc-puzzle abc-puzzle-0.2.1 +$ nix-env -f '' -qaP -A haskell.packages.ghc927 +haskell.packages.ghc927.a50 a50-0.5 +haskell.packages.ghc927.AAI AAI-0.2.0.1 +haskell.packages.ghc927.aasam aasam-0.2.0.0 +haskell.packages.ghc927.abacate abacate-0.0.0.0 +haskell.packages.ghc927.abc-puzzle abc-puzzle-0.2.1 … ``` diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f4f526cc485a..8c51eb406e6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -225,7 +225,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc92 = ghc926; + ghc92 = ghc927; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -434,7 +434,7 @@ in { ghc = bh.compiler.ghc927; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc92 = ghc926; + ghc92 = ghc927; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9a06b9c9eed2..adc9b9fe0a73 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -333,8 +333,8 @@ let ; }; - haskell.packages.native-bignum.ghc926 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc926) + haskell.packages.native-bignum.ghc927 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc927) hello lens random @@ -507,7 +507,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc926 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc927 ]; }; } From 499be5802684091917e14e6e320504d5c770b990 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 17:50:26 +0100 Subject: [PATCH 005/117] haskellPackages: stackage LTS 20.11 -> LTS 20.12 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 119 +++++++++--------- 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 169a3664f1da..eb450fd1d6b6 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 20.11 +# Stackage LTS 20.12 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - active ==0.2.0.16 - - ad ==4.5.3 + - ad ==4.5.4 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 @@ -206,7 +206,7 @@ default-package-overrides: - Blammo ==1.1.1.1 - blank-canvas ==0.7.3 - blanks ==0.5.0 - - blas-carray ==0.1.0.1 + - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.3 - blas-ffi ==0.1 - blas-hs ==0.1.1.0 @@ -253,7 +253,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - bugzilla-redhat ==1.0.1 - - burrito ==2.0.1.2 + - burrito ==2.0.1.3 - butcher ==1.3.3.2 - bv ==0.5 - byteable ==0.1.1 @@ -377,7 +377,7 @@ default-package-overrides: - colorize-haskell ==1.0.1 - colour ==2.3.6 - columnar ==1.0.0.0 - - combinatorial ==0.1.0.1 + - combinatorial ==0.1.1 - comfort-array ==0.5.2.1 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 @@ -447,8 +447,8 @@ default-package-overrides: - cookie ==0.4.6 - copr-api ==0.1.0 - core-data ==0.3.9.0 - - core-program ==0.6.3.0 - - core-telemetry ==0.2.7.3 + - core-program ==0.6.5.0 + - core-telemetry ==0.2.8.0 - core-text ==0.3.8.0 - countable ==1.2 - country ==0.2.3 @@ -563,7 +563,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.2 + - deferred-folds ==0.9.18.3 - dejafu ==2.4.0.4 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -603,7 +603,7 @@ default-package-overrides: - dimensional ==1.5 - di-monad ==1.3.1 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.27 + - direct-sqlite ==2.3.28 - dirichlet ==0.1.0.7 - discount ==0.1.1 - discover-instances ==0.1.0.0 @@ -713,7 +713,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.8.1 + - esqueleto ==3.5.8.2 - essence-of-live-coding ==0.2.7 - essence-of-live-coding-gloss ==0.2.7 - essence-of-live-coding-pulse ==0.2.7 @@ -801,7 +801,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.1 + - flow ==2.0.0.2 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -922,11 +922,11 @@ default-package-overrides: - ghc-prof ==1.4.1.12 - ghc-source-gen ==0.4.3.0 - ghc-syntax-highlighter ==0.0.8.0 - - ghc-tcplugins-extra ==0.4.3 + - ghc-tcplugins-extra ==0.4.4 - ghc-trace-events ==0.1.2.6 - - ghc-typelits-extra ==0.4.4 - - ghc-typelits-knownnat ==0.7.7 - - ghc-typelits-natnormalise ==0.7.7 + - ghc-typelits-extra ==0.4.5 + - ghc-typelits-knownnat ==0.7.8 + - ghc-typelits-natnormalise ==0.7.8 - ghc-typelits-presburger ==0.6.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.25 @@ -953,7 +953,7 @@ default-package-overrides: - gi-pango ==1.0.27 - githash ==0.1.6.3 - github ==0.28.0.1 - - github-release ==2.0.0.2 + - github-release ==2.0.0.3 - github-rest ==1.1.2 - github-types ==0.2.1 - github-webhooks ==0.16.0 @@ -1019,7 +1019,7 @@ default-package-overrides: - happstack-server ==7.7.2 - happstack-server-tls ==7.2.1.3 - happy ==1.20.1.1 - - happy-meta ==0.2.0.11 + - happy-meta ==0.2.1.0 - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - hasbolt ==0.1.6.2 @@ -1027,7 +1027,7 @@ default-package-overrides: - hashids ==1.0.2.7 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskeline ==0.8.2 + - haskeline ==0.8.2.1 - haskell-gi ==0.26.2 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 @@ -1063,7 +1063,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.4 - HDBC-session ==0.1.2.0 - - headed-megaparsec ==0.2.1 + - headed-megaparsec ==0.2.1.1 - heap ==1.0.4 - heaps ==0.4 - heatshrink ==0.1.0.0 @@ -1143,7 +1143,7 @@ default-package-overrides: - hruby ==0.5.0.0 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.8 + - hsc2hs ==0.68.9 - hscolour ==1.24.4 - hsdns ==1.8 - hse-cpp ==0.2 @@ -1162,7 +1162,7 @@ default-package-overrides: - hslua-marshalling ==2.2.1 - hslua-module-doclayout ==1.0.4 - hslua-module-path ==1.0.3 - - hslua-module-system ==1.0.2 + - hslua-module-system ==1.0.3 - hslua-module-text ==1.0.3.1 - hslua-module-version ==1.0.3 - hslua-objectorientation ==2.2.1 @@ -1182,7 +1182,7 @@ default-package-overrides: - 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 + - hspec-golden ==0.2.0.1 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.1.0.2 @@ -1330,14 +1330,14 @@ default-package-overrides: - interpolatedstring-perl6 ==1.0.2 - interpolation ==0.1.1.2 - Interpolation ==0.3.0 - - IntervalMap ==0.6.1.2 + - IntervalMap ==0.6.2.0 - intervals ==0.9.2 - intset-imperative ==0.1.0.0 - invariant ==0.6 - invert ==1.0.0.2 - invertible-grammar ==0.1.3.3 - io-machine ==0.2.0.0 - - io-manager ==0.1.0.3 + - io-manager ==0.1.0.4 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 @@ -1357,7 +1357,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.7 + - isomorphism-class ==0.1.0.9 - iterable ==3.0 - ixset ==1.1.1.2 - ixset-typed ==0.5.1.0 @@ -1377,11 +1377,11 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.10 - - json-feed ==2.0.0.4 + - json-feed ==2.0.0.5 - jsonifier ==0.2.1.2 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - - json-stream ==0.4.4.2 + - json-stream ==0.4.5.2 - JuicyPixels ==3.3.7 - JuicyPixels-extra ==0.5.2 - JuicyPixels-scale-dct ==0.1.2 @@ -1410,7 +1410,7 @@ default-package-overrides: - koji ==0.0.2 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==2.0.0.3 + - lackey ==2.0.0.4 - LambdaHack ==0.11.0.0 - lame ==0.2.0 - language-avro ==0.1.4.0 @@ -1470,7 +1470,7 @@ default-package-overrides: - line ==4.0.1 - linear ==1.21.10 - linear-base ==0.3.0 - - linear-generics ==0.2 + - linear-generics ==0.2.1 - linebreak ==1.1.0.2 - linenoise ==0.3.2 - linux-capabilities ==0.1.1.0 @@ -1742,7 +1742,7 @@ default-package-overrides: - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.1.0 + - nonempty-vector ==0.2.2.0 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 @@ -1794,7 +1794,7 @@ default-package-overrides: - opentelemetry-lightstep ==0.8.0 - opentelemetry-wai ==0.8.0 - open-witness ==0.6 - - operational ==0.2.4.1 + - operational ==0.2.4.2 - operational-class ==0.3.0.0 - opml-conduit ==0.9.0.0 - optics ==0.4.2 @@ -1844,10 +1844,9 @@ default-package-overrides: - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - partial-semigroup ==0.6.0.1 - - password ==3.0.2.0 + - password ==3.0.2.1 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - pasta-curves ==0.0.1.0 - path ==0.9.2 - path-binary-instance ==0.1.0.1 - path-dhall-instance ==0.2.1.0 @@ -1944,7 +1943,7 @@ default-package-overrides: - polysemy-webserver ==0.2.1.1 - polysemy-zoo ==0.8.1.0 - pontarius-xmpp ==0.5.6.5 - - pooled-io ==0.0.2.2 + - pooled-io ==0.0.2.3 - portable-lines ==0.1 - port-utils ==0.2.1.0 - posix-paths ==0.3.0.0 @@ -1987,13 +1986,13 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.7.3.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.5 + - primitive-extras ==0.10.1.6 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 - prim-uniq ==0.2 - print-console-colors ==0.1.0.0 - - probability ==0.2.7 + - probability ==0.2.8 - process-extras ==0.7.4 - product-profunctors ==0.11.0.3 - profiterole ==0.1 @@ -2019,7 +2018,7 @@ default-package-overrides: - proto-lens-protoc ==0.7.1.1 - proto-lens-runtime ==0.7.0.3 - proto-lens-setup ==0.4.0.6 - - protolude ==0.3.2 + - protolude ==0.3.3 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.3 @@ -2051,7 +2050,7 @@ default-package-overrides: - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.7.1 - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1.1 + - quickcheck-transformer ==0.3.1.2 - quickcheck-unicode ==1.0.1.0 - quicklz ==1.5.0.11 - quiet ==0.2 @@ -2060,7 +2059,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.3 + - rampart ==2.0.0.4 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.1 @@ -2077,8 +2076,8 @@ default-package-overrides: - rank2classes ==1.4.6 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.4 - - ratel-wai ==2.0.0.1 + - ratel ==2.0.0.5 + - ratel-wai ==2.0.0.2 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==11.2.14 @@ -2094,7 +2093,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - reanimate-svg ==0.13.0.1 - rebase ==1.16.1 - - rec-def ==0.2 + - rec-def ==0.2.1 - record-dot-preprocessor ==0.2.15 - record-hasfield ==1.0 - rec-smallarray ==0.1.0.0 @@ -2199,7 +2198,7 @@ default-package-overrides: - safe-json ==1.1.3.1 - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - - salve ==2.0.0.1 + - salve ==2.0.0.2 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2268,7 +2267,7 @@ default-package-overrides: - servant-client-core ==0.19 - servant-conduit ==0.15.1 - servant-docs ==0.12 - - servant-elm ==0.7.2 + - servant-elm ==0.7.3 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - servant-foreign ==0.15.4 @@ -2356,7 +2355,7 @@ default-package-overrides: - skylighting-core ==0.13.2.1 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1 - - skylighting-format-context ==0.1.0.1 + - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.2 @@ -2404,12 +2403,12 @@ default-package-overrides: - srt-formatting ==0.1.0.0 - stache ==2.3.3 - stack ==2.9.1 - - stack-all ==0.4.0.1 + - stack-all ==0.4.1 - stack-clean-old ==0.4.6 - stack-templatizer ==0.1.0.2 - state-codes ==0.1.3 - stateref ==0.3 - - statestack ==0.3.1 + - statestack ==0.3.1.1 - StateVar ==1.2.2 - stateWriter ==0.3.0 - static-text ==0.2.0.7 @@ -2423,14 +2422,14 @@ default-package-overrides: - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.8 + - stm-hamt ==1.2.0.9 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6.1 - - storable-record ==0.0.6 + - storable-record ==0.0.7 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - store ==0.7.16 @@ -2470,9 +2469,9 @@ default-package-overrides: - stripe-scotty ==1.1.0.3 - stripe-signature ==1.0.0.15 - stripe-wreq ==1.0.1.15 - - strive ==6.0.0.4 + - strive ==6.0.0.5 - strongweak ==0.3.2 - - structs ==0.1.7 + - structs ==0.1.8 - structured ==0.1.1 - structured-cli ==2.7.0.1 - stylish-haskell ==0.14.3.0 @@ -2530,7 +2529,7 @@ default-package-overrides: - tasty ==1.4.3 - tasty-ant-xml ==1.1.8 - tasty-autocollect ==0.3.2.0 - - tasty-bench ==0.3.2 + - tasty-bench ==0.3.3 - tasty-dejafu ==2.1.0.0 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2763,7 +2762,7 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.1 + - universum ==1.8.1.1 - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - unix-time ==0.4.8 @@ -2896,12 +2895,12 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - weigh ==0.0.16 - - wide-word ==0.1.4.0 + - wide-word ==0.1.5.0 - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.1.6.0 -with-compiler: ghc-9.2.5 + - witch ==1.1.6.1 +with-compiler: ghc-9.2.6 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -2925,7 +2924,7 @@ with-compiler: ghc-9.2.5 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==2.0.1.0 + - wuss ==2.0.1.1 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -2950,7 +2949,7 @@ with-compiler: ghc-9.2.5 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.2 - xml-helpers ==1.0.0 - - xmlhtml ==0.2.5.3 + - xmlhtml ==0.2.5.4 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.3.1 @@ -2964,8 +2963,8 @@ with-compiler: ghc-9.2.5 - xor ==0.0.1.1 - xss-sanitize ==0.3.7.1 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.10.0 - - yaml-unscrambler ==0.1.0.12 + - yaml ==0.11.11.0 + - yaml-unscrambler ==0.1.0.13 - Yampa ==0.13.7 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 From a8abc9e550782b512a0ea20fcda3d10c72b65f64 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 17:50:51 +0100 Subject: [PATCH 006/117] all-cabal-hashes: 2023-02-19T09:15:19Z -> 2023-03-01T16:43:25Z 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 57ed980f0ff4..71c87c15ea2f 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "1f7cec5b787f338430007a1176f686ddbd85cbc5", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1f7cec5b787f338430007a1176f686ddbd85cbc5.tar.gz", - "sha256": "0ddnzb8l5gbpsar1pz2dq86xa1mv4840f9ppk5viwnzgyfiqzfv8", - "msg": "Update from Hackage at 2023-02-19T09:15:19Z" + "commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz", + "sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a", + "msg": "Update from Hackage at 2023-03-01T16:43:25Z" } From bc6029b2d1ecc649e9d8b8bab6c5d3c7167df04c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 18:33:52 +0100 Subject: [PATCH 007/117] 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 | 2680 +++++++++++------ 1 file changed, 1738 insertions(+), 942 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cd5575cd1b13..f5dd7a60f980 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1340,8 +1340,8 @@ self: { pname = "BNFC-meta"; version = "0.6.1"; sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia"; - revision = "4"; - editedCabalFile = "1yjrkmzzpvsn6zpn2dy3fx0x4sf4q6w0ibxh6i1j3m7czmrbp30s"; + revision = "5"; + editedCabalFile = "1d0p524370r8jff7p3rnp6hrqlr85nhg8n2ydpfjwwmp4arp1il2"; libraryHaskellDepends = [ alex-meta array base fail happy-meta haskell-src-meta syb template-haskell @@ -2910,8 +2910,8 @@ self: { pname = "Cabal"; version = "3.8.1.0"; sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; - revision = "1"; - editedCabalFile = "1bah5bdjy5zxpwnzsdqibf999nirm1np8j76vr34na5vg5knrlaq"; + revision = "2"; + editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -6001,8 +6001,8 @@ self: { }: mkDerivation { pname = "FailT"; - version = "0.1.1.0"; - sha256 = "1hv9zycvsf696x9g73w9jhlipw826vl71gix09jmm02i9jpyr4q2"; + version = "0.1.2.0"; + sha256 = "1hvn1bzkaazzc6hdyq27kfd99jbvj9wbsfajahsf3rzp9mqxbqzi"; libraryHaskellDepends = [ base exceptions mtl text ]; testHaskellDepends = [ base doctest exceptions hspec mtl QuickCheck quickcheck-classes @@ -9719,6 +9719,8 @@ self: { pname = "HTF"; version = "0.15.0.0"; sha256 = "16sbz9rr1v8p3b0qi6b9rvzqgbd4rr05qp2wiiy0nc2gh1qca4nq"; + revision = "1"; + editedCabalFile = "1rd9iwchb4pg441hvqi7qn41v0ihd8sh2ma1h8incyswn527m1ml"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -9743,6 +9745,43 @@ self: { mainProgram = "htfpp"; }) {}; + "HTF_0_15_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff + , directory, filepath, haskell-src, HUnit, lifted-base + , monad-control, mtl, old-time, pretty, process, QuickCheck, random + , regex-compat, template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.15.0.1"; + sha256 = "0mlqsfc0b4gvinq7nrq42smdl0gagznhwiw86dkkzc1npmcaj5mw"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + libraryToolDepends = [ cpphs ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + executableToolDepends = [ cpphs ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + description = "The Haskell Test Framework"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "htfpp"; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split @@ -11277,8 +11316,8 @@ self: { pname = "HsYAML"; version = "0.2.1.1"; sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; - revision = "1"; - editedCabalFile = "0jmbgrjywcblrd8k6zzv2b5givdz83f479y15v5gs0r93z25xpmv"; + revision = "2"; + editedCabalFile = "0r2yh96nhmlfy2vj2c7i5703brv4lp9cw5v044j7s8487jvv70d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11300,8 +11339,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "5"; - editedCabalFile = "06v8vkn58d67yx4v59rhvxpc0sjrpi6k8krvjrvbyl0fn0v0jd14"; + revision = "6"; + editedCabalFile = "1c7v808i9wafx0z74skim7h96z7hdl4v7clawg9s1idzzwhihjcr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11754,24 +11793,6 @@ self: { }) {}; "IntervalMap" = callPackage - ({ mkDerivation, base, Cabal, containers, criterion, deepseq - , fingertree, QuickCheck, random, SegmentTree, weigh - }: - mkDerivation { - pname = "IntervalMap"; - version = "0.6.1.2"; - sha256 = "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld"; - libraryHaskellDepends = [ base containers deepseq ]; - testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree random SegmentTree - weigh - ]; - description = "Containers for intervals, with efficient search"; - license = lib.licenses.bsd3; - }) {}; - - "IntervalMap_0_6_2_0" = callPackage ({ mkDerivation, base, Cabal, containers, criterion, deepseq , fingertree, QuickCheck, random, SegmentTree, weigh }: @@ -11787,7 +11808,6 @@ self: { ]; description = "Containers for intervals, with efficient search"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Irc" = callPackage @@ -14346,8 +14366,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "2"; - editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy"; + revision = "3"; + editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -15695,6 +15715,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "OneTuple_0_4_1_1" = callPackage + ({ mkDerivation, base, foldable1-classes-compat, ghc-prim, hashable + , template-haskell + }: + mkDerivation { + pname = "OneTuple"; + version = "0.4.1.1"; + sha256 = "0axv63061gzjg6b31h9zg6v54fms6ggd1m8v6kcclmqyxva69ry9"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ + base foldable1-classes-compat hashable template-haskell + ]; + description = "Singleton Tuple"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Only" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -24994,8 +25031,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.5.3"; - sha256 = "1p4r70s9xslza7ag3ifnf69ji37mkkj2gabfi1lj0fyssm0jyy5y"; + version = "4.5.4"; + sha256 = "034n4zabzbbxc8bbc6drc0pam0cn12ijad0z2i3gdcqqn93bcap1"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers @@ -25525,24 +25562,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_1_1_0" = callPackage + "aeson_2_1_2_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist - , filepath, generic-deriving, generically, ghc-prim, hashable - , indexed-traversable, integer-logarithms, OneTuple, primitive - , QuickCheck, quickcheck-instances, scientific, semialign, strict - , tagged, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-short, th-abstraction, these, time - , time-compat, unordered-containers, uuid-types, vector, witherable + , exceptions, filepath, generic-deriving, generically, ghc-prim + , hashable, indexed-traversable, integer-logarithms, OneTuple + , primitive, QuickCheck, quickcheck-instances, scientific + , semialign, strict, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-short + , th-abstraction, these, time, time-compat, unordered-containers + , uuid-types, vector, witherable }: mkDerivation { pname = "aeson"; - version = "2.1.1.0"; - sha256 = "1bdn4j2jglpxhy3kl3y5pf8dr032qjjfbl8ivjk591fdcy6rgbm3"; + version = "2.1.2.1"; + sha256 = "1ii26lz9czxqhck11pzhqlhfhm9zgbrhiydv4gh1w66f0fwl4h2x"; + revision = "1"; + editedCabalFile = "1yiib3ay9961pzs1bb09waw40qkk8w74553bwjp5gkym3dk3q3zi"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers - data-fix deepseq dlist generically ghc-prim hashable + data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable OneTuple primitive QuickCheck scientific semialign strict tagged template-haskell text text-short th-abstraction these time time-compat unordered-containers @@ -25698,8 +25738,8 @@ self: { pname = "aeson-compat"; version = "0.3.10"; sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; - revision = "4"; - editedCabalFile = "001w7pck3q5k4cnx53npllil5cblkg1ssqza4s9v347dfih3zmss"; + revision = "5"; + editedCabalFile = "0h9ycmx7ad8m3iby8zgv33ql76zggnkiw8c8hnyrh98lm45jj1y0"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -27389,8 +27429,8 @@ self: { pname = "alex-meta"; version = "0.3.0.13"; sha256 = "0lbralcid373p25m4qhrhrjak87p8wp4as3304sj6ba6xka89q3v"; - revision = "3"; - editedCabalFile = "1r84p34insanbsmmn529qc0ymna1v4mxm77j4m2l4iraj7qhvfnl"; + revision = "4"; + editedCabalFile = "0b9p2gndna2mk85pywilqwn3zm4yyn9s9ss6p3rlaax70218mlgg"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -31928,6 +31968,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ansi-terminal-game_1_9_1_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, colour, containers, exceptions, hspec, hspec-discover + , linebreak, mintty, mtl, QuickCheck, random, split, terminal-size + , timers-tick, unidecode + }: + mkDerivation { + pname = "ansi-terminal-game"; + version = "1.9.1.0"; + sha256 = "07mafxlpwi4a92h9r4j01z2nksk4a143rcs3v6y0w1nd5vwcksf6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions hspec linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testToolDepends = [ hspec-discover ]; + description = "sdl-like functions for terminal applications, based on ansi-terminal"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -35265,15 +35333,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_5_4_0" = callPackage + "ascii_1_6_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.5.4.0"; - sha256 = "1lgmdhgby6kdvsl8xg2swqvw9vzlni7s53g42jidd13iappzkxkq"; + version = "1.6.0.0"; + sha256 = "0ax8gn1nbb9p6ai8rq48jf98vn952q4xl7h1mxi377rywcpfy9y5"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35419,8 +35487,8 @@ self: { pname = "ascii-numbers"; version = "1.1.0.2"; sha256 = "0dqqnqrn3hvmjgakm6vzbidlik4p483wcslcwr60qbxa1v5lmznv"; - revision = "2"; - editedCabalFile = "19x9mh11pb7j4ykf9vicprn6mlhcb9gwsk82gh5yk366k4r172d7"; + revision = "4"; + editedCabalFile = "1jam0pzzb678k5bfr6prdzg8v68md2rg39k7sqr4csh1lzkq86im"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35432,6 +35500,26 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-numbers_1_2_0_0" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base + , bytestring, hashable, hedgehog, invert, text + }: + mkDerivation { + pname = "ascii-numbers"; + version = "1.2.0.0"; + sha256 = "0542g7whn8qhamgmpx32i875j16ksvjy42l5n7mkq717g86ngz2r"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable text + ]; + testHaskellDepends = [ + ascii-case ascii-char ascii-superset base bytestring hashable + hedgehog invert text + ]; + description = "ASCII representations of numbers"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-predicates" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { @@ -35504,14 +35592,14 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-superset_1_2_7_0" = callPackage + "ascii-superset_1_3_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base , bytestring, hashable, hspec, text }: mkDerivation { pname = "ascii-superset"; - version = "1.2.7.0"; - sha256 = "140xdw3r9aj9yhjwbvhqyb4c4scad2rfdj9kf6yh1aqf4lqvh0kn"; + version = "1.3.0.0"; + sha256 = "0csfjkg5aqx2cs9n27rs4zbfrlzgf7c3ca8vfh8f0vpy4qy94f33"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char base bytestring hashable text ]; @@ -35568,6 +35656,8 @@ self: { pname = "ascii-th"; version = "1.2.0.0"; sha256 = "07v6795rfwb8h4x31kc7vdmwg9z23jf4418dcv612c27dqhx4hbg"; + revision = "1"; + editedCabalFile = "1r6z6brkfahs9zifjhr7bpqblkiajcjknkgx2i57jrn5s3b97phk"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-superset base template-haskell @@ -37326,6 +37416,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-framer" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, hspec, network, network-run, QuickCheck, text + }: + mkDerivation { + pname = "attoparsec-framer"; + version = "0.1.0.0"; + sha256 = "00vswlad9f5pqibfrch94vx6kxzswi7h47d64xqvmakasaahyn5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions text + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions network + network-run QuickCheck text + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions hspec + QuickCheck text + ]; + description = "Use Attoparsec to parse framed protocol bytestreams"; + license = lib.licenses.bsd3; + }) {}; + "attoparsec-ip" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector @@ -38611,10 +38726,8 @@ self: { }: mkDerivation { pname = "aws-arn"; - version = "0.3.0.0"; - sha256 = "042lzvm1wpdqfrmgl1ygqgkdisvjyf9jfg9aqnibwhk2pw354dj3"; - revision = "1"; - editedCabalFile = "15l89gbz5lzc5v9v872cqdjkvpkiamx4qa6zpl6l4j8b24wkrcay"; + version = "0.3.1.0"; + sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -40188,6 +40301,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_2_0_9" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.2.0.9"; + sha256 = "1iyyp76mfdiniszim6mi5ls5a2d3nm0fkrkz9v1y0r2gx1d1y3zx"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + description = "Calculation of bank holidays in England and Wales"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -40560,6 +40686,8 @@ self: { pname = "base16"; version = "0.3.2.1"; sha256 = "0ybmcik5nlly7s9bfwlaqqk8jpgwxp5ac4bhdiq4lckbfynvm0qf"; + revision = "1"; + editedCabalFile = "0qjaz2kkcmrfzbr6f44jkb1zdgbayh0yahp06j8gb281783ng6d8"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -41843,6 +41971,27 @@ self: { license = lib.licenses.mit; }) {}; + "beam-migrate_0_5_2_0" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, microlens, mtl, parallel, pqueue, pretty + , scientific, text, time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.5.2.0"; + sha256 = "036awq66h8r8mn46kvzlc0si6vq6ajg69kv1xq0865v7arrlr296"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl + parallel pqueue pretty scientific text time unordered-containers + uuid-types vector + ]; + description = "SQL DDL support and migrations support library for Beam"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-mysql" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, bytestring , case-insensitive, free, hashable, mtl, mysql, network-uri @@ -41906,6 +42055,34 @@ self: { license = lib.licenses.mit; }) {}; + "beam-postgres_0_5_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, case-insensitive, conduit, free, hashable + , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl + , network-uri, postgresql-libpq, postgresql-simple, scientific + , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , transformers-base, unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "beam-postgres"; + version = "0.5.3.0"; + sha256 = "0y5pm0s83f2ijz0mslp98c07ywh25nx3g870hp8s89isjviwhdss"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring + case-insensitive conduit free hashable haskell-src-exts lifted-base + monad-control mtl network-uri postgresql-libpq postgresql-simple + scientific tagged text time transformers-base unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base beam-core beam-migrate bytestring hedgehog + postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + ]; + description = "Connection layer between beam and postgres"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate , bytestring, dlist, free, hashable, monad-control, mtl @@ -41930,6 +42107,31 @@ self: { license = lib.licenses.mit; }) {}; + "beam-sqlite_0_5_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, monad-control, mtl + , network-uri, scientific, sqlite-simple, tasty + , tasty-expected-failure, tasty-hunit, text, time + , transformers-base, unix + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.5.2.0"; + sha256 = "1cjf9jci0ykkvqry1yygfmjli73si6zgskgpym2n28r93g0c3znd"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable monad-control mtl network-uri scientific sqlite-simple + text time transformers-base unix + ]; + testHaskellDepends = [ + base beam-core beam-migrate sqlite-simple tasty + tasty-expected-failure tasty-hunit text time + ]; + description = "Beam driver for SQLite"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -41984,8 +42186,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14"; - sha256 = "0iyymq8iagdaymivvfg1vvks76bzaiyysw5mj4ifqn2zc9pyb3wd"; + version = "0.14.1"; + sha256 = "0kq1dsyg1dcdyhlapa2zak51gb4ghfv2hnivzg7iv0x8i4sdsh2n"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -42800,6 +43002,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "bifunctors_5_5_15" = 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.15"; + sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -43262,6 +43487,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_4" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, data-array-byte, hashable, primitive + , QuickCheck, quickcheck-instances, scientific, tagged, tasty + , tasty-quickcheck, text, text-binary, time-compat + , unordered-containers, vector, vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.4"; + sha256 = "0pv4idgzl2wkm15ih594gbw6wihwrdspa91j5ajgwr4ikx6f3v3h"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text text-binary time-compat + unordered-containers vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive data-array-byte + hashable primitive QuickCheck quickcheck-instances scientific + tagged tasty tasty-quickcheck text time-compat unordered-containers + vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -43328,6 +43580,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-orphans_1_0_4" = callPackage + ({ mkDerivation, base, binary, data-array-byte, OneTuple + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "binary-orphans"; + version = "1.0.4"; + sha256 = "08999f7c9l3dck59k1p9jj2nbbdj99i3gwmrqj24la5rywgw8rd0"; + libraryHaskellDepends = [ + base binary data-array-byte transformers + ]; + testHaskellDepends = [ + base binary data-array-byte OneTuple QuickCheck + quickcheck-instances tagged tasty tasty-quickcheck + ]; + description = "Compatibility package for binary; provides instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -46228,22 +46501,6 @@ self: { }) {}; "blas-carray" = callPackage - ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi - , storable-complex, transformers - }: - mkDerivation { - pname = "blas-carray"; - version = "0.1.0.1"; - sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; - libraryHaskellDepends = [ - base blas-ffi carray netlib-carray netlib-ffi storable-complex - transformers - ]; - description = "Auto-generated interface to Fortran BLAS via CArrays"; - license = lib.licenses.bsd3; - }) {}; - - "blas-carray_0_1_0_2" = callPackage ({ mkDerivation, base, blas-ffi, carray, netlib-carray, netlib-ffi , storable-complex, transformers }: @@ -46257,7 +46514,6 @@ self: { ]; description = "Auto-generated interface to Fortran BLAS via CArrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "blas-comfort-array" = callPackage @@ -48261,6 +48517,8 @@ self: { pname = "bound"; version = "2.0.6"; sha256 = "1mlnpc4x7gn97b8pqiwj3shv23slfylwplp7zr37ar5ff9isbm28"; + revision = "1"; + editedCabalFile = "104j2gindmyqs4hl56irvndz9s9j7s4yyjhlwz3s87r9053sr1p9"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -48874,6 +49132,19 @@ self: { broken = true; }) {}; + "brick-list-search" = callPackage + ({ mkDerivation, base, brick, containers, microlens, vector }: + mkDerivation { + pname = "brick-list-search"; + version = "0.1.2.1"; + sha256 = "1kn5i8nhq8a5g62rnfpy1kzxfn7y2ffx4l4llfvm19nmvksr8vb3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base brick containers microlens vector ]; + description = "Search forward or backward for certain kinds of items in brick list"; + license = lib.licenses.bsd0; + }) {}; + "brick-panes" = callPackage ({ mkDerivation, aeson, base, brick, bytestring, containers , directory, microlens, text, text-zipper, time, vector, vty @@ -48936,13 +49207,14 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "0.1.0.2"; - sha256 = "1ldzbl9wnk6ghckbxlmqs3vf1qivh7qndgy5iryasiy9bil8h9fk"; + version = "0.2.0.1"; + sha256 = "1rqmpk45fy9w6jqmaxdbg8giv3dv72qd522yz1wsj4zmkfjrhw41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers generic-lens microlens optics-core vty ]; + doHaddock = false; description = "Tabular list widgets for brick"; license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; @@ -50289,26 +50561,6 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; - version = "2.0.1.2"; - sha256 = "1awfxllw4n1zg58q08ml25k0f3mvbrlsws17m40hwp3ddvv8nyfd"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, parsec , QuickCheck, template-haskell, text, transformers }: @@ -50326,7 +50578,6 @@ self: { ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -50714,6 +50965,8 @@ self: { pname = "byte-order"; version = "0.1.3.0"; sha256 = "0lr5ijhc165qhviabklnl0zpbk5400wb1fqd1xn7x0ga1vvclxhl"; + revision = "1"; + editedCabalFile = "0gkp45pasdg9k98yaw3fpsch4wy50q5n4wdmqlsffciimc0k11x1"; libraryHaskellDepends = [ base primitive primitive-unaligned wide-word ]; @@ -50759,6 +51012,8 @@ self: { pname = "bytebuild"; version = "0.3.12.0"; sha256 = "0n87jhn46yafnd3kjy07nxs2f36s99xk89x6cwkhiwhvz5hw6c2v"; + revision = "1"; + editedCabalFile = "0mwnhra1nharn5kmbf5k6zqpb2jhkybfc9xbi3wpnq2kp2l1l1al"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted @@ -50801,8 +51056,8 @@ self: { pname = "bytehash"; version = "0.1.0.0"; sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm"; - revision = "1"; - editedCabalFile = "0wipnznxav1c0pfjv4r6nb44gidz9c6z8qi919yzg2xmwhdz631v"; + revision = "2"; + editedCabalFile = "0b840m5ykjgqzxd8sfzjgbs86qm87lzcf477xnl8zlmf11yhjyqg"; libraryHaskellDepends = [ base byte-order byteslice bytestring entropy primitive primitive-unlifted transformers @@ -50949,6 +51204,8 @@ self: { pname = "byteslice"; version = "0.2.9.0"; sha256 = "0rqlpqcnyfwl2m4jy8k7n062drdwpvd3j622f4z4fxyhd84dxv5y"; + revision = "1"; + editedCabalFile = "1gcc560gsyf87nvja7cdh6wsp631lv02qhci6r4fcmn2wasqx3mz"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st text text-short tuples vector @@ -50972,6 +51229,8 @@ self: { pname = "bytesmith"; version = "0.3.9.1"; sha256 = "10d0wzinc30b2xc26cfadvpn29gf30gnppysyl3n35ym3p9lnhm2"; + revision = "1"; + editedCabalFile = "11pmza7qlk63lw6ns6jsnlmfl8wdazz5sc5b2spb0pk29k9yymp2"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -52568,8 +52827,8 @@ self: { pname = "cabal-install"; version = "3.8.1.0"; sha256 = "1rk7xb86c1vgarv1m16d2i82fiig6q119j51gvq2pq8l5rpl7kk1"; - revision = "2"; - editedCabalFile = "1l2lvljkr1ibnr3py7xfp2csxyb3rzlhy7jlpx8gkamq9cjmi6p2"; + revision = "3"; + editedCabalFile = "14l2jvyrzhgkmgkrkhmb6cb1vy4pgcg3q8dgyg8vszpm0mb1ws77"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52977,6 +53236,29 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-rpm_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.1.0"; + sha256 = "0qcnx23k4mc37bn5x6d8n459vlq8q6acqz9f0bvih07j68rmnfvm"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-rpm"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -54677,8 +54959,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; - revision = "1"; - editedCabalFile = "1ilnax8c71xvj84a36c91l3ypcil1f6kbadssv0fz2n2c4m6r7g6"; + revision = "2"; + editedCabalFile = "1kap52pv98sgr2mqxcd66wgxxyjp94p8w1b7b3gqwvk9jcanfwxl"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control mtl mutable-containers primitive reflection safe-exceptions @@ -58568,6 +58850,8 @@ self: { pname = "chronos"; version = "1.1.5"; sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; + revision = "2"; + editedCabalFile = "10f7a2r5y71cycx8m74swpplvd68s736fi3b48a48f5vvdgvwdfa"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -60463,8 +60747,8 @@ self: { pname = "cleff"; version = "0.3.3.0"; sha256 = "0fnpk28nhafypp7p1ay1760sin9hh06dz23r68gmm93i879ayl9b"; - revision = "1"; - editedCabalFile = "1g3y1sh1rg7calrpr5l5rmm4hdyqbni59hm10dkb62xb23v5p6mq"; + revision = "3"; + editedCabalFile = "1dampx9zdpj14g6a7xhsyk9xg3zq2chpv0h43jb85pyyh6ig7rb4"; libraryHaskellDepends = [ atomic-primops base containers exceptions microlens monad-control primitive template-haskell th-abstraction transformers-base @@ -61300,6 +61584,31 @@ self: { mainProgram = "cloudyfs"; }) {}; + "clplug" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , containers, directory, fgl, fmt, format-numbers, lens, lens-aeson + , mtl, network, text, time + }: + mkDerivation { + pname = "clplug"; + version = "0.1.0.0"; + sha256 = "1p8mpk0bk657xcnjxgz9jyv6ihx9l5fykw082ja5i0qsa55xindp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit mtl network text + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory fgl + fmt format-numbers lens lens-aeson mtl network text time + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring conduit mtl network text + ]; + description = "Create Core Lightning Plugins"; + license = lib.licenses.bsd3; + }) {}; + "clr-bindings" = callPackage ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes , template-haskell, text @@ -63507,24 +63816,6 @@ self: { }) {}; "combinatorial" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, transformers - , utility-ht - }: - mkDerivation { - pname = "combinatorial"; - version = "0.1.0.1"; - sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4"; - libraryHaskellDepends = [ - array base containers transformers utility-ht - ]; - testHaskellDepends = [ - array base containers QuickCheck transformers utility-ht - ]; - description = "Count, enumerate, rank and unrank combinatorial objects"; - license = lib.licenses.bsd3; - }) {}; - - "combinatorial_0_1_1" = callPackage ({ mkDerivation, array, base, containers, doctest-exitcode-stdio , doctest-lib, QuickCheck, transformers, utility-ht }: @@ -63541,7 +63832,6 @@ self: { ]; description = "Count, enumerate, rank and unrank combinatorial objects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "combinatorial-problems" = callPackage @@ -63599,6 +63889,8 @@ self: { pname = "comfort-array"; version = "0.5.2.1"; sha256 = "01vijksddhqmypikk0kgsw02fqdp3anvxvvmhimw11kg87n5dy7v"; + revision = "1"; + editedCabalFile = "1ly48lsdy806r323k7mxaz5wq5xhgiwlhvdmsg7qxa6jmb6iyx1n"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -63663,10 +63955,8 @@ self: { }: mkDerivation { pname = "comfort-glpk"; - version = "0.0"; - sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy"; - revision = "1"; - editedCabalFile = "12d7vmy8nas78gzq2s3a9gbpffbv4afjnkqzrdmgnzj3jkljzc7p"; + version = "0.0.0.1"; + sha256 = "005k3w37xxgwbdd5wby75jhqnvim7fixp82kkqazij7wzdmnlr5h"; libraryHaskellDepends = [ base comfort-array deepseq glpk-headers non-empty utility-ht ]; @@ -68145,6 +68435,8 @@ self: { pname = "contiguous"; version = "0.6.3.0"; sha256 = "1vqzv5xr6dkvw0789rz3z39b7ldm9xrk2sv8c9k2fk14yxl7qibx"; + revision = "1"; + editedCabalFile = "1q1yihx7caa639mfmk0a2n881qrj3g3gm9mb6m23bv5xkkbklrmp"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -69187,27 +69479,6 @@ self: { }) {}; "core-program" = callPackage - ({ mkDerivation, base, bytestring, 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, unliftio-core - }: - mkDerivation { - pname = "core-program"; - version = "0.6.3.0"; - sha256 = "1jd1733f2yn9bsbj5p4y62gqjlzdykpj5yaisd82s28lijqrqi02"; - libraryHaskellDepends = [ - base bytestring 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 unliftio-core - ]; - description = "Opinionated Haskell Interoperability"; - license = lib.licenses.mit; - }) {}; - - "core-program_0_6_5_0" = callPackage ({ mkDerivation, base, bytestring, core-data, core-text, directory , exceptions, filepath, fsnotify, hashable, hourglass, mtl , prettyprinter, safe-exceptions, stm, template-haskell @@ -69226,7 +69497,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -69237,8 +69507,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.7.3"; - sha256 = "1lini012vrpxn947l5aa7wjjqny9mxzvmhpzkmvpmc72cmqhfcjw"; + version = "0.2.8.0"; + sha256 = "0zmddy3br8c3ii6ddrcf7v742n050hh34wrfwc94jfbrq79m6k6p"; libraryHaskellDepends = [ base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions @@ -69265,6 +69535,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_8_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.8.1"; + sha256 = "1c3icqjnwhy5xwbvl6lqz5hy8jqdzy4w1v3f70xgnvcgp3i01ph5"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -69645,6 +69933,8 @@ self: { pname = "country"; version = "0.2.3.1"; sha256 = "0c601fa2m6f5b9g7i1azh9aqhnsiqcrpqmngwnhrxf8gm4jh5yi5"; + revision = "1"; + editedCabalFile = "1l8ik38d92xrhfd9a6an4i5zcmvqpxicggdihy6hcj1yl1997qsc"; libraryHaskellDepends = [ aeson attoparsec base bytebuild bytehash byteslice bytestring contiguous deepseq entropy hashable primitive primitive-unlifted @@ -78064,8 +78354,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.2"; - sha256 = "0amlxdgz1yfql1r7w6z9gy6gncihp5nm1fl2bxrk7027hc0wdp96"; + version = "0.9.18.3"; + sha256 = "0x27yqcmpcdfnpf7hn0v574wr641xg23k8fn18w9klc0l3m3089v"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector @@ -79162,6 +79452,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6_3" = 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.3"; + sha256 = "0ak9csg3843wppjgdh2lvfhszdxgahscn4sbmxs2l0dr5l0rggxi"; + 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-openapi3" = callPackage ({ mkDerivation, aeson, base, deriving-aeson, lens, openapi3, text }: @@ -79191,17 +79505,18 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, exceptions, monad-control + ({ mkDerivation, base, exceptions, logict, monad-control , monad-control-identity, mtl, primitive, random, resourcet , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.8.0.0"; - sha256 = "10i7lhpdpy68mi2ax5v445hy39m160jvvxqhz3hb4ixgzhibdi0h"; + version = "0.8.1.0"; + sha256 = "0h0hxsazvg9vbzm81za3qglqkxw6chxxcfcvf8cinhi3hfy41cir"; libraryHaskellDepends = [ - base exceptions monad-control monad-control-identity mtl primitive - random resourcet transformers transformers-base unliftio-core + base exceptions logict monad-control monad-control-identity mtl + primitive random resourcet transformers transformers-base + unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; @@ -82332,8 +82647,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.27"; - sha256 = "0bnq7gkia713w1kc6zhwclxsyxlg100i93qbrz59z18j0xwds683"; + version = "2.3.28"; + sha256 = "0i4a7g8ffsryifv7abg50qcrgbi71sbyhdx4i2vvv0k4srngyi37"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -82360,12 +82675,12 @@ self: { broken = true; }) {}; - "directory_1_3_8_0" = callPackage + "directory_1_3_8_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.0"; - sha256 = "0dxxq7ibslj0vks7bf5ckwsp37h6rni7aglsg4zw897520nvpxyv"; + version = "1.3.8.1"; + sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -82478,6 +82793,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dirforest" = callPackage + ({ mkDerivation, aeson, autodocodec, base, containers, deepseq + , filepath, path, path-io, validity, validity-containers + , validity-path + }: + mkDerivation { + pname = "dirforest"; + version = "0.1.0.0"; + sha256 = "05rxvdl31gbsllj9h9yhv3vppq4l9kzg3p69rh5cy3bm218d888x"; + libraryHaskellDepends = [ + aeson autodocodec base containers deepseq filepath path path-io + validity validity-containers validity-path + ]; + description = "Typed directory forest"; + license = lib.licenses.mit; + }) {}; + "dirichlet" = callPackage ({ mkDerivation, base, hspec, log-domain, math-functions , mwc-random, random, vector @@ -85664,6 +85996,36 @@ self: { mainProgram = "dotenv"; }) {}; + "dotenv_0_10_0_1" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec + , mtl, optparse-applicative, process, shellwords, text + }: + mkDerivation { + pname = "dotenv"; + version = "0.10.0.1"; + sha256 = "16as8ymd7n3fihgylr1fjwpn7s2pi6c81rba72rw47pm9c4s2ivs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory exceptions megaparsec mtl process + shellwords text + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec mtl process shellwords text + ]; + testToolDepends = [ hspec-discover ]; + description = "Loads environment variables from dotenv files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "dotenv"; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -87097,6 +87459,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_10_1" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.10.1"; + sha256 = "10rp5hc0zafxp2zc2n1lz7j726hlshi8khry74x700474kdqgmx8"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -87117,8 +87497,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.9.2"; - sha256 = "0ghc1sg1s31qg1z1sg1mzm9qad39ggrkr064mwbwsl2b5xlsnlr4"; + version = "0.10.1"; + sha256 = "0m8ajl03chy3qbyf1iii9rmfsyy9gpcm4i2njcbwpyi5m10zx34q"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -89004,6 +89384,8 @@ self: { pname = "effectful-th"; version = "1.0.0.1"; sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; + revision = "1"; + editedCabalFile = "0vj46wzmc2diydx3cfn5sbv25bjcg6gw1cy0q1rqlxbhggm9zk94"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -89949,15 +90331,15 @@ self: { broken = true; }) {}; - "eliminators_0_9_1" = callPackage + "eliminators_0_9_2" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.1"; - sha256 = "0qw6fd6mskwyj1mzz6a6vdxh80jqxn0dzmwp1vq8py1cgnzrpfda"; + version = "0.9.2"; + sha256 = "0j0k1lw6b5yqz7kxckb5s0phqcnzdis0b469nxryawsv12wvv335"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -90017,8 +90399,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "elliptic-integrals"; - version = "0.1.0.0"; - sha256 = "15a3sx336d418gbkmdncqzrird8kv861yghf9kf8czn8wqk0ygm2"; + version = "0.1.0.1"; + sha256 = "0k74qvkxbcqqpgnp41vv7hnnjhbkqq53k11qzv20djpk7qxp5i26"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Carlson Elliptic Integrals and Incomplete Elliptic Integrals"; @@ -92842,15 +93224,15 @@ self: { , microlens, monad-logger, mtl, optparse-applicative , optparse-generic, parser-combinators, persistent , persistent-sqlite, persistent-template, pretty-show, safe - , shakespeare, template-haskell, text, time, transformers + , shakespeare, template-haskell, text, time, transformers, unix , unordered-containers, vector, wai, wai-extra, wai-logger, warp , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed , yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.11"; - sha256 = "1y3hvrwb6sg2vgjrxakl27gh9i1kr8x4l64jc6sfxqx4gvrgi338"; + version = "0.0.16"; + sha256 = "102pfhl04rhrfxbq24wvbg6gz2dnsj3krskzlb8afmkn1n4wpc8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92862,7 +93244,7 @@ self: { http-api-data http-client http-client-tls http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe - shakespeare template-haskell text time transformers + shakespeare template-haskell text time transformers unix unordered-containers vector wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed yesod-static ]; @@ -92876,9 +93258,9 @@ self: { iso8601-time microlens monad-logger mtl optparse-applicative optparse-generic parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell - text time transformers unordered-containers vector wai wai-extra - wai-logger warp yaml yesod yesod-auth yesod-core yesod-form - yesod-newsfeed yesod-static + text time transformers unix unordered-containers vector wai + wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + yesod-form yesod-newsfeed yesod-static ]; testHaskellDepends = [ aeson attoparsec base base64 bcrypt blaze-html bytestring @@ -92890,9 +93272,9 @@ self: { http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time - transformers unordered-containers vector wai wai-extra wai-logger - warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed - yesod-static yesod-test + transformers unix unordered-containers vector wai wai-extra + wai-logger warp yaml yesod yesod-auth yesod-core yesod-form + yesod-newsfeed yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; @@ -92909,8 +93291,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.8.1"; - sha256 = "0k7h2hbxv14x0kq9w2wi83h0swzlri99ic9rj76540l39yqwjc5v"; + version = "3.5.8.2"; + sha256 = "058f79z5sm6ifw54a3x0cm6k59cpj78z0p2lxrbcv754z60dms63"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -94268,6 +94650,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventuo11y-prometheus" = callPackage + ({ mkDerivation, base, containers, eventuo11y, prometheus }: + mkDerivation { + pname = "eventuo11y-prometheus"; + version = "0.1.0.0"; + sha256 = "1yqwqvvzlnzph4x0l19nw5blnp85z2p0wjhhbvygl2dwiq6981li"; + libraryHaskellDepends = [ base containers eventuo11y prometheus ]; + description = "Prometheus backend for eventuo11y"; + license = lib.licenses.asl20; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -97578,18 +97971,21 @@ self: { }) {}; "fcf-containers" = callPackage - ({ mkDerivation, base, doctest, first-class-families, ghc-prim, mtl + ({ mkDerivation, base, containers, doctest, first-class-families + , ghc-prim, mtl, text }: mkDerivation { pname = "fcf-containers"; - version = "0.7.2"; - sha256 = "0lw7zm5k4mkvzxxmhp2lbanlkgb3n6gp583g34r53rz576bhhhj9"; + version = "0.8.0"; + sha256 = "1j6xisy2xs5vfbl9ycmaqdzbys56k0nhwgzs8nx9qz6sik08r8s8"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; + libraryHaskellDepends = [ + base containers first-class-families ghc-prim mtl text + ]; executableHaskellDepends = [ base first-class-families ]; testHaskellDepends = [ - base doctest first-class-families ghc-prim + base containers doctest first-class-families ghc-prim text ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; @@ -99197,14 +99593,14 @@ self: { broken = true; }) {}; - "filepath_1_4_100_1" = callPackage + "filepath_1_4_100_3" = callPackage ({ mkDerivation, base, bytestring, checkers, deepseq, exceptions , QuickCheck, template-haskell }: mkDerivation { pname = "filepath"; - version = "1.4.100.1"; - sha256 = "0i3a0bg1csjgkwnwzs80h62kp3gil06qgjxsb3nkjprnspzaf55w"; + version = "1.4.100.3"; + sha256 = "1qkx057ddixpvnkps8rbml1iiymv9bpvan6zs4f4cljh7wbi27gd"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -100902,15 +101298,15 @@ self: { license = lib.licenses.mit; }) {}; - "flatparse_0_4_0_1" = callPackage + "flatparse_0_4_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, gauge , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive , QuickCheck, quickcheck-instances, template-haskell, utf8-string }: mkDerivation { pname = "flatparse"; - version = "0.4.0.1"; - sha256 = "0cv9ip5vh6sw039acpghcanlnyrvfrmd3av1ihbf66w7y0qv1h40"; + version = "0.4.0.2"; + sha256 = "0h1vz0qai9zbr6mqfcidpabjxwcr900582sfmslx08bksssfssbf"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell utf8-string ]; @@ -101298,18 +101694,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; - version = "2.0.0.1"; - sha256 = "1drbw1lbglx30i48mq9a77f34jff6wxvgq1d4rk8axlfis6pnj4h"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_2" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; @@ -101319,7 +101703,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -102050,6 +102433,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "foldable1-classes-compat" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , QuickCheck, quickcheck-instances, tagged, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "foldable1-classes-compat"; + version = "0.1"; + sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; + libraryHaskellDepends = [ + base containers ghc-prim tagged transformers + ]; + testHaskellDepends = [ + base containers QuickCheck quickcheck-instances test-framework + test-framework-quickcheck2 transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq transformers + ]; + description = "Compatibility package for the Foldable1 and Bifoldable1 type classes"; + license = lib.licenses.bsd3; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, primitive @@ -102060,6 +102466,8 @@ self: { pname = "foldl"; version = "1.4.14"; sha256 = "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"; + revision = "1"; + editedCabalFile = "0v055cj7sw5xa7v0lm2gryfhj8nxhnjrs1zm9nnxyzgv2aivb8vc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -103773,6 +104181,8 @@ self: { pname = "free"; version = "5.1.10"; sha256 = "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj"; + revision = "1"; + editedCabalFile = "0kpb7vfhl29c15miln3wsgqwjd8bz43v500dyaprwsglmgprwbdw"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -106682,8 +107092,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gambler"; - version = "0.0.0.1"; - sha256 = "0ndkfy0yisbmhh5zg5djafsh62km8fdrnzg3z1gia4mmmfkn44s9"; + version = "0.2.0.0"; + sha256 = "0hr3ig4cwlaq09z852lmfmr9sakxyrpfydkslps8zv95pbr15yhz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Composable, streaming, and efficient left folds"; @@ -107708,8 +108118,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.1.1"; - sha256 = "0jcqknrlpcyl825y9r612mh8d7dcs68sxjm1j600nbdl4ksw8qmb"; + version = "0.2.1.2"; + sha256 = "0dnv96wnhp648ydhy883i13lsgmirqlrc62ijgisi66dpkwxmcm3"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -107941,6 +108351,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-deriving_1_14_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.14.3"; + sha256 = "0h5wiz9455q844z6f14v581sj2y36p4fnd4zwyr5ss1n5c4aakwy"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -108205,33 +108633,21 @@ self: { }) {}; "generic-persistence" = callPackage - ({ mkDerivation, base, bytestring, convertible, exceptions, ghc - , ghc-prim, HDBC, HDBC-sqlite3, hspec, hspec-discover, QuickCheck - , rio, syb, text, time, transformers + ({ mkDerivation, base, convertible, generic-deriving, HDBC + , HDBC-sqlite3, hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "generic-persistence"; - version = "0.2.0.1"; - sha256 = "1i50bdywfrlfqz1by8x3ci2nap5c1hl2bvhw5h2ych7szrp9mmp7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 rio syb text time transformers - ]; - executableHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 rio syb text time transformers - ]; + version = "0.3.0.1"; + sha256 = "01qpw1hf593f4hf7j9hhrpm6aclwi55gmqpmmjnpnz18f8ahwygp"; + libraryHaskellDepends = [ base convertible generic-deriving HDBC ]; testHaskellDepends = [ - base bytestring convertible exceptions ghc ghc-prim HDBC - HDBC-sqlite3 hspec hspec-discover QuickCheck rio syb text time - transformers + base convertible generic-deriving HDBC HDBC-sqlite3 hspec + hspec-discover QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; license = lib.licenses.bsd3; - mainProgram = "generic-persistence-demo"; }) {}; "generic-pretty" = callPackage @@ -108884,6 +109300,35 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-dirforest" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, dirforest + , filepath, genvalidity, genvalidity-bytestring + , genvalidity-containers, genvalidity-criterion, genvalidity-path + , genvalidity-sydtest, genvalidity-sydtest-aeson, genvalidity-text + , path, path-io, QuickCheck, sydtest, sydtest-discover + }: + mkDerivation { + pname = "genvalidity-dirforest"; + version = "0.1.0.1"; + sha256 = "0pmw9lbh0ssf02z8daiwwqiqnqcx34xy4jh0r2ipdfn2sfn20rwn"; + libraryHaskellDepends = [ + base containers dirforest filepath genvalidity + genvalidity-containers genvalidity-path path QuickCheck + ]; + testHaskellDepends = [ + base bytestring containers dirforest filepath + genvalidity-bytestring genvalidity-sydtest + genvalidity-sydtest-aeson path path-io QuickCheck sydtest + ]; + testToolDepends = [ sydtest-discover ]; + benchmarkHaskellDepends = [ + base criterion dirforest genvalidity genvalidity-criterion + genvalidity-text + ]; + description = "Generators for typed directory forests"; + license = lib.licenses.mit; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -110691,6 +111136,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_2_7_20230228" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.2.7.20230228"; + sha256 = "0z9bgkrvr7v12444cq4mkms5f0p5g3jpm2ni1ra0iqcw014r3w78"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser @@ -110753,6 +111220,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_2_7_20230228" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.2.7.20230228"; + sha256 = "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -111460,12 +111948,12 @@ self: { }) {}; "ghc-tcplugin-api" = callPackage - ({ mkDerivation, base, ghc, transformers }: + ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.9.0.0"; - sha256 = "1z14z12lhdc1bfa3qnq2srx0cm14cbkg7af94cdfqpqmbxjgw5h3"; - libraryHaskellDepends = [ base ghc transformers ]; + version = "0.10.0.0"; + sha256 = "0ynn4acij7n3vfmsm02chdi6j4m3p3cyz9f7vhhi7z9aqzawxd0l"; + libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; }) {}; @@ -111474,8 +111962,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.3"; - sha256 = "18c0fkbamaizrf91khayg0i59qjk28pfc6g378y70gwqzjkcv1g9"; + version = "0.4.4"; + sha256 = "0yfyxwjsg0r6biy8mskc0xpm32z6zldhzxlvy9dr22h8ds57089w"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -111532,8 +112020,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.4"; - sha256 = "1pjai171y374569xzqnp6amf7dvj57pcfykh3g48m5jij2b8jbc6"; + version = "0.4.5"; + sha256 = "1asr1ykmqalvbyrhf91vsnx989vw3qp28w8sl3pgwns1azirsz7r"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -111553,8 +112041,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.7"; - sha256 = "0b7rhnij3i74baqm7ban92sfdiscbjvrypfi6wwipkc8graii467"; + version = "0.7.8"; + sha256 = "08pa3gbzxmz5iif9ggg7xvg0bz0h4h4bdnwkvy6lljh2r4fyw8r7"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -111573,8 +112061,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.7"; - sha256 = "0pqpsy3j4brpg2hrq9qrnjzr1bishycny5gvsdncvhaq3m53gslh"; + version = "0.7.8"; + sha256 = "0hny036kinnn73byyhdwvmp2s5c27zs7krrz01kx5xk7mmhhx2nn"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-tcplugins-extra transformers ]; @@ -112325,8 +112813,8 @@ self: { }: mkDerivation { pname = "ghcup"; - version = "0.1.19.0"; - sha256 = "00g91zavfd58y17q723izch9j0x3fhx7a14ng061am5h41i76mlq"; + version = "0.1.19.2"; + sha256 = "1230hs209w7j427pkibzw4x9skcji4fhsmhjxlks4c6amanianmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114059,8 +114547,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230214"; - sha256 = "10mlil7xlkfx7jcd65ndvrg1gb864dqfy2zyfck0z0rynll7s1d2"; + version = "10.20230227"; + sha256 = "03cnx63gcrza9sshk9fvwq8c2p7cb7hj8h81g5dc1x56syigdpgi"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -114698,30 +115186,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; - version = "2.0.0.2"; - sha256 = "0xyh4nkrclpvy5i9v0yqlbzm6aq5gl4p3sairdi1abnyzn3ij04h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_3" = callPackage ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers @@ -114742,7 +115206,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -119026,6 +119489,29 @@ self: { mainProgram = "goldplate"; }) {}; + "goldplate_0_2_1_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff + , directory, filepath, Glob, optparse-applicative, process + , regex-pcre-builtin, text, unordered-containers + }: + mkDerivation { + pname = "goldplate"; + version = "0.2.1.1"; + sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty async base bytestring Diff directory filepath + Glob optparse-applicative process regex-pcre-builtin text + unordered-containers + ]; + testHaskellDepends = [ base process ]; + description = "A lightweight golden test runner"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "goldplate"; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -120667,8 +121153,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "1.1.0.0"; - sha256 = "07k87v5a9mbpap0n9lra5h4r45359831z7z0ihcibv8nzkkwy798"; + version = "1.2.0.0"; + sha256 = "1qngvwah69jb175shpy5n9qqyxck6687c20bqqlij4nj8amp4vfh"; libraryHaskellDepends = [ base conduit containers exceptions megaparsec parser-combinators template-haskell text transformers unordered-containers vector @@ -121188,8 +121674,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.2.0"; - sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx"; + version = "2.0.3.0"; + sha256 = "17njclgkdawnm7hyjv12f2bar93ak9nysfx82igvb6qdp0213a91"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -122950,16 +123436,16 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi - , libXinerama, libXrandr + ({ mkDerivation, base, c, containers, libGL, libX11, libXcursor + , libXext, libXi, libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.1.1"; - sha256 = "0g1n4msjgxhgkdvjy44hd6hhg05iahin09ij5v6vyigdzbyx6hf9"; + version = "4.5.3.1"; + sha256 = "042milcmyimk5xirxhs0f5a8gmawp6d2a718zd0ccs162db4691g"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base containers ]; librarySystemDepends = [ c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; @@ -124083,7 +124569,7 @@ self: { mainProgram = "hackage-cli"; }) {}; - "hackage-cli_0_1_0_0" = callPackage + "hackage-cli_0_1_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, directory, filepath, http-io-streams, io-streams , microlens, microlens-mtl, microlens-th, mtl, netrc @@ -124093,10 +124579,8 @@ self: { }: mkDerivation { pname = "hackage-cli"; - version = "0.1.0.0"; - sha256 = "0wl2gpbcpdfmmmi99dkxy68gi3mn1aj8f2xrm5c8w1bs4sdxdzdq"; - revision = "1"; - editedCabalFile = "0v63w3v46n5jc3q7ywsih3wyqxg6f61psskpq1wkfwm9mnyxfwla"; + version = "0.1.0.1"; + sha256 = "023gnhdxwn36k3pd74j5jcykqbrj7nvp131mg761h8913h9ldw1r"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -124265,8 +124749,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.3"; sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "1"; - editedCabalFile = "0c1hg72yxpkmcpl22rm40gf0xx3djdakscqll5g7hsgda4bkg2lr"; + revision = "2"; + editedCabalFile = "10zh1wwn3n0kbybdacd3sg0izvw6xa6aadxdc0bzm9mf0g8m9ff7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124291,6 +124775,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; + revision = "2"; + editedCabalFile = "07i8f4sappqphh39jj9268a6ci7l972qi33p4zydsdrvh5s58h0q"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -124314,8 +124800,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "4"; - editedCabalFile = "09hs3iidjlwdppm5q1vq58p70js11whhcl5nr73kv8zj1yh0ir3h"; + revision = "5"; + editedCabalFile = "0rbn1dp6vahxcjavksbwdw8v8mx31inhyn4mx3mx2x4f9rb7y6kw"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -127465,10 +127951,8 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.11"; - sha256 = "1vgv5fx1fya7wfh3zwdgy0hm0lyzp171gnpp6ymfd6kqmqkl3293"; - revision = "4"; - editedCabalFile = "1p50xyx6hl0iyqmqxacisfmpq702rm797fjhfaxjjw6733k5zmrc"; + version = "0.2.1.0"; + sha256 = "114i3bgks4i364v99fc5gvsg2zhh2p59j0y95r0zffxrci6r5cwl"; libraryHaskellDepends = [ array base containers fail haskell-src-meta mtl template-haskell ]; @@ -128128,6 +128612,8 @@ self: { pname = "hash-addressed"; version = "0.2.0.1"; sha256 = "1j4zr63if21g208zyhdk2mz8v3pfp23s33mrqzig0rryw3f0kby7"; + revision = "2"; + editedCabalFile = "0iaaby674182cxwdzpsaz52skzs3klgkid9c7sajz4pi6kh921xl"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash-sha256 directory filepath gambler mtl pipes quaalude resourcet temporary @@ -128759,17 +129245,15 @@ self: { mainProgram = "haskeem"; }) {}; - "haskeline_0_8_2" = callPackage + "haskeline_0_8_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.2"; - sha256 = "1pr7zik1138cj0463867i1qqb2bgsq716mryap18jx7zb9f1b7gc"; - revision = "3"; - editedCabalFile = "101qavk0fmc4c6qa307kswz3345psskxqyxhk6hmykynjm05jjrv"; + version = "0.8.2.1"; + sha256 = "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -129495,6 +129979,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_26_3" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.26.3"; + sha256 = "1shqh45w9ac1mwd1y50hy4xm2wr7pyc6wzfsv6i2j74jj3f1ph4f"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -133062,6 +133569,23 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-implicits_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hasql + , network-ip, scientific, text, time, uuid, vector + }: + mkDerivation { + pname = "hasql-implicits"; + version = "0.1.1"; + sha256 = "1q9m227q56ykfbg9rza1p22hkiqss139h43nxvl8dq0cmxw3d0mf"; + libraryHaskellDepends = [ + aeson base bytestring containers hasql network-ip scientific text + time uuid vector + ]; + description = "Implicit definitions for Hasql, such as default codecs for standard types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-interpolate" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty @@ -135341,8 +135865,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.2.1"; - sha256 = "17k4zjvd4i47yz1izbrx98k2lxk5hh553wf94bjn1rdl06vlhc18"; + version = "0.2.1.1"; + sha256 = "1fzvzggw09kbd75rwdb5qfc2fc497yzwkxrmqa1xjwcdspnmrxrl"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -139757,6 +140281,51 @@ self: { mainProgram = "hindent"; }) {}; + "hindent_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, Diff, directory, exceptions, filepath, ghc-lib-parser + , ghc-lib-parser-ex, hspec, monad-loops, mtl, optparse-applicative + , path, path-io, regex-tdfa, split, syb, text, transformers + , unicode-show, utf8-string, yaml + }: + mkDerivation { + pname = "hindent"; + version = "6.0.0"; + sha256 = "17pkbjb4zqnzv3bnw3zwisf9j2m9lw5irq7i12bgwrzpv15fpabz"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal containers deepseq directory exceptions + filepath ghc-lib-parser ghc-lib-parser-ex monad-loops mtl path + path-io regex-tdfa split syb text transformers unicode-show + utf8-string yaml + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory exceptions filepath + ghc-lib-parser ghc-lib-parser-ex monad-loops mtl + optparse-applicative path path-io regex-tdfa split syb text + transformers unicode-show utf8-string yaml + ]; + testHaskellDepends = [ + base bytestring Cabal containers Diff directory exceptions filepath + ghc-lib-parser ghc-lib-parser-ex hspec monad-loops mtl path path-io + regex-tdfa split syb text transformers unicode-show utf8-string + yaml + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion deepseq directory + exceptions filepath ghc-lib-parser ghc-lib-parser-ex monad-loops + mtl path path-io regex-tdfa split syb text transformers + unicode-show utf8-string yaml + ]; + doHaddock = false; + description = "Extensible Haskell pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hindent"; + }) {}; + "hindley-milner" = callPackage ({ mkDerivation, base, containers, data-fix, hspec, mtl , transformers @@ -142215,6 +142784,8 @@ self: { pname = "hls-fourmolu-plugin"; version = "1.1.1.0"; sha256 = "1gxsx1qskjgm0vgqw7cy33mlkczqr7b6whlykppbpnsfxa2il4jg"; + revision = "1"; + editedCabalFile = "0v65jd14rvfrw5bcn6asqr5sk1zwbvazv233gnw4ylkw0kspmww5"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp process-extras text @@ -142478,6 +143049,8 @@ self: { pname = "hls-rename-plugin"; version = "1.0.2.0"; sha256 = "16hzr13k8dafdpsr23wz8kyjjyybdg2v41r10iy5csjggyqp9iq7"; + revision = "1"; + editedCabalFile = "13f1xi8cirismn746d8qxnhg3rkiz6zmsaymnhpv0hnhdg5ll6g4"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hiedb hls-plugin-api hls-refactor-plugin lsp lsp-types mod syb text @@ -145194,16 +145767,17 @@ self: { "horizon-spec" = callPackage ({ mkDerivation, base, containers, dhall, path, path-dhall-instance - , prettyprinter, sydtest, text + , prettyprinter, sydtest, template-haskell, text, th-lift }: mkDerivation { pname = "horizon-spec"; - version = "0.6"; - sha256 = "0p62f79p3bpjjrxfgvvd4i7p54y9xdjxxqg3qxji88m3mgvs4sfw"; + version = "0.6.4"; + sha256 = "0bxpgx1ybk4klhd193yzli3qqbhlbbx40kj18nz1scvd75yzyah9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers dhall path path-dhall-instance text + base containers dhall path path-dhall-instance template-haskell + text th-lift ]; executableHaskellDepends = [ base dhall prettyprinter sydtest text @@ -145214,6 +145788,32 @@ self: { mainProgram = "horizon-spec-tests"; }) {}; + "horizon-spec-lens" = callPackage + ({ mkDerivation, base, horizon-spec, lens }: + mkDerivation { + pname = "horizon-spec-lens"; + version = "0.1"; + sha256 = "10dl8dy3nfa87qqq1q7dbpfrcncgfp4mvkn6r6kgpsl0wkrh9nxp"; + libraryHaskellDepends = [ base horizon-spec lens ]; + description = "Horizon Stable Package Set Lenses"; + license = lib.licenses.mit; + }) {}; + + "horizon-spec-pretty" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall, horizon-spec + , lens, path, text + }: + mkDerivation { + pname = "horizon-spec-pretty"; + version = "0.0.1"; + sha256 = "0cznc9xgg4h0bcsih0gd87scv9qiccxj4z17xwkic4xbmq50ppwf"; + libraryHaskellDepends = [ + base bytestring containers dhall horizon-spec lens path text + ]; + description = "Horizon Stable Package Set Pretty Printer"; + license = lib.licenses.mit; + }) {}; + "horizontal-rule" = callPackage ({ mkDerivation, ansi-wl-pprint, base, HMock, optparse-applicative , tasty, tasty-hunit, terminal-size, text, time @@ -147433,6 +148033,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-awsxray" = callPackage + ({ mkDerivation, base, bytestring, errors, hs-opentelemetry-api + , hs-opentelemetry-sdk, hspec, http-types, memory, microlens + , random, text, time, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "hs-opentelemetry-awsxray"; + version = "0.1.0.0"; + sha256 = "17qps8qhniq8nzldnhisv0i2d1gc5lfhbzrawhisadgjsbwlxryj"; + libraryHaskellDepends = [ + base bytestring errors hs-opentelemetry-api hs-opentelemetry-sdk + http-types memory microlens random text time unliftio unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base hs-opentelemetry-api hspec text unordered-containers + ]; + description = "[synopsis]"; + license = lib.licenses.mit; + }) {}; + "hs-opentelemetry-exporter-in-memory" = callPackage ({ mkDerivation, async, base, hs-opentelemetry-api, unagi-chan }: mkDerivation { @@ -148538,30 +149159,6 @@ self: { }) {}; "hsc2hs" = callPackage - ({ mkDerivation, base, containers, directory, filepath, HUnit - , process, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "hsc2hs"; - version = "0.68.8"; - sha256 = "0lksyyfrvn3km8bmfjad0mr50mg20f9fwfqly83lma0pr7xiwd3q"; - revision = "1"; - editedCabalFile = "0s9s46zmm4g4hlwspi4jimggka87xki68lfg555g94sjnbwjk34q"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base containers directory filepath process - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - description = "A preprocessor that helps with writing Haskell bindings to C code"; - license = lib.licenses.bsd3; - mainProgram = "hsc2hs"; - }) {}; - - "hsc2hs_0_68_9" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , process, test-framework, test-framework-hunit }: @@ -148580,7 +149177,6 @@ self: { ]; description = "A preprocessor that helps with writing Haskell bindings to C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsc2hs"; }) {}; @@ -150097,6 +150693,30 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-aeson_2_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , hslua-core, hslua-marshalling, mtl, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "2.3.0"; + sha256 = "18ivirgkn5yhkym2nfwx8x360q26hqxdjihzs3g1ggyybw6w9qwv"; + libraryHaskellDepends = [ + aeson base bytestring containers hashable hslua-core + hslua-marshalling mtl scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hashable hslua-core + hslua-marshalling mtl QuickCheck quickcheck-instances scientific + tasty tasty-hunit tasty-quickcheck text unordered-containers vector + ]; + description = "Allow aeson data types to be used with Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hslua-classes" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck @@ -150245,26 +150865,6 @@ self: { }) {}; "hslua-module-system" = callPackage - ({ mkDerivation, base, directory, exceptions, hslua-core - , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua - , temporary, text - }: - mkDerivation { - pname = "hslua-module-system"; - version = "1.0.2"; - sha256 = "0lacf9jzd53r75dk5nvkx0nwgiakpkingjnz58bhjfnvi81r6ddn"; - libraryHaskellDepends = [ - base directory exceptions hslua-core hslua-marshalling - hslua-packaging temporary text - ]; - testHaskellDepends = [ - base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text - ]; - description = "Lua module wrapper around Haskell's System module"; - license = lib.licenses.mit; - }) {}; - - "hslua-module-system_1_0_3" = callPackage ({ mkDerivation, base, directory, exceptions, hslua-core , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua , temporary, text @@ -150282,7 +150882,6 @@ self: { ]; description = "Lua module wrapper around Haskell's System module"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -150712,8 +151311,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.7"; - sha256 = "0n216ly2mn6v5n0aqi759d4lp4fa7mi63fwkvdbzmlmc0ndhi9q7"; + version = "0.3.8"; + sha256 = "0npj7ckscgx4y44vjdxz1x8k8y5czcwbz23x504ilrgjk8l77ddp"; libraryHaskellDepends = [ base bytestring connection HTTP http-client http-conduit http-types MissingH mtl network network-uri rdf4h text xml @@ -151163,17 +151762,18 @@ self: { "hspec-golden" = callPackage ({ mkDerivation, base, directory, filepath, hspec, hspec-core - , optparse-applicative, silently + , hspec-discover, optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.2.0.0"; - sha256 = "0sg9f73x2i1g6n1pjcvb1zx4nx17w5drdrrhzp2z3lsxc9yxs8nk"; + version = "0.2.0.1"; + sha256 = "09c7bpbvkrdp0fxhr0s1v9gm6hcsqb3fyhix5bckaqhniccdnr5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath hspec-core ]; executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; + testToolDepends = [ hspec-discover ]; description = "Golden tests for hspec"; license = lib.licenses.mit; mainProgram = "hgold"; @@ -151839,8 +152439,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.1.1.0"; - sha256 = "1x8vya93aqcbipw6m0rwza8xk59im49bms4w5525s24mw82cnsjq"; + version = "0.1.2.0"; + sha256 = "0x85ya24w47qh38w0rndnik2niy3mh0n2zamxfvzshbj3zqdip5d"; libraryHaskellDepends = [ base containers hashable numeric-prelude text unordered-containers ]; @@ -157601,6 +158201,8 @@ self: { pname = "hybrid-vectors"; version = "0.2.3"; sha256 = "0g3z482sd0j930ja3g9cyc4xnjby03d4cq8x56crsl61arr81r1c"; + revision = "1"; + editedCabalFile = "0w0kajygmrbwds5cmfkvk50x51msds61cia3kch3q8rfvdc0v9gl"; libraryHaskellDepends = [ base deepseq primitive semigroups vector ]; @@ -161064,6 +161666,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "indexed-traversable-instances_0_1_1_2" = callPackage + ({ mkDerivation, base, containers, indexed-traversable, OneTuple + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indexed-traversable-instances"; + version = "0.1.1.2"; + sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; + libraryHaskellDepends = [ + base indexed-traversable OneTuple tagged unordered-containers + vector + ]; + testHaskellDepends = [ + base containers indexed-traversable OneTuple QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -163230,6 +163855,29 @@ self: { license = lib.licenses.bsd2; }) {}; + "invariant_0_6_1" = 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.6.1"; + sha256 = "1w6ln343d72hx8q4i7h1ca7gfqyb79ghc3q2fxp9qkjmwsnr8wpv"; + 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "inventory" = callPackage ({ mkDerivation, appendmap, array, base, bytestring, containers , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit @@ -163458,8 +164106,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "io-manager"; - version = "0.1.0.3"; - sha256 = "04584flxw3qwzdnas8nbxp6riw6jfvhgy0kkkzjkxg53y1d8ri3s"; + version = "0.1.0.4"; + sha256 = "0qrpxb18yivzsyqnnri77yk20wl5s6c7x61s7k6ka5dr5l207bcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -163530,6 +164178,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; + revision = "1"; + editedCabalFile = "1fkjzk7s99sb7h1lvandw9p8r05ly4206y3aiah0jg39zjvbi5az"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -163553,8 +164203,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "6"; - editedCabalFile = "024aw98q1x3fb1xq07qki3z446w6lk5gyjl13shy0dbrd5aafh92"; + revision = "7"; + editedCabalFile = "0wib2mz6ifnixrcp9s1pkd00v9q7dvyka1z7zqc3pgif47hr1dbw"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -163707,6 +164357,8 @@ self: { pname = "ip"; version = "1.7.6"; sha256 = "11ckl62w9005pww467ydx38imadzwrn36ww21c535x3jhhbic3a9"; + revision = "1"; + editedCabalFile = "0j9zs161awzvcbnc72prs6byzcy65gqg3q2m3hsi70hxbvpkm0zk"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -164748,8 +165400,8 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.7"; - sha256 = "0kngrwjj5m2pg4pkcvcxamsx82y03lfpj4hs7ifsxf64qm67bmgy"; + version = "0.1.0.9"; + sha256 = "1d0vgmabjyiqpkgrn1hq6a77nyf7imi50ki9gq8a528l2k7sifig"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector @@ -164763,29 +165415,6 @@ self: { license = lib.licenses.mit; }) {}; - "isomorphism-class_0_1_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector - }: - mkDerivation { - pname = "isomorphism-class"; - version = "0.1.0.8"; - sha256 = "1yz3bj3lf805jc9f91y0j2r0xw2ramvqx8xig1xj71nj9idd7lr9"; - libraryHaskellDepends = [ - base bytestring containers hashable primitive text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hashable primitive QuickCheck - quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text - unordered-containers vector - ]; - description = "Isomorphism typeclass solving the conversion problem"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -165772,6 +166401,20 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "jacobi-elliptic" = callPackage + ({ mkDerivation, base, elliptic-integrals, jacobi-theta, tasty + , tasty-hunit + }: + mkDerivation { + pname = "jacobi-elliptic"; + version = "0.1.1.0"; + sha256 = "1vwfs1br5p35zjw58zpziakda48lxmwsmvl554y10djkby25g71k"; + libraryHaskellDepends = [ base elliptic-integrals jacobi-theta ]; + testHaskellDepends = [ base elliptic-integrals tasty tasty-hunit ]; + description = "Neville Theta Functions and Jacobi Elliptic Functions"; + license = lib.licenses.bsd3; + }) {}; + "jacobi-roots" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, vector }: mkDerivation { @@ -165790,8 +166433,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.0.0"; - sha256 = "1k7hd17785qyh4k26j0hpaays6nn5751bh4ni132psmqvp8dw6am"; + version = "0.1.1.0"; + sha256 = "1qi494yn7krnrlq4g083zj1cw16qa9r1al9wqz4b42s33igiw2is"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -167657,25 +168300,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "2.0.0.4"; - sha256 = "022zdas84skhh9s17k6mx45axrzfv2c7jf7f2rhk324706b7wxfl"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -167692,7 +168316,6 @@ self: { ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -168032,10 +168655,8 @@ self: { }: mkDerivation { pname = "json-sop"; - version = "0.2.1"; - sha256 = "0kzl21669wh9vdxspliflciwrkn5wamwwyg96aqrm4ybdqscpcn4"; - revision = "2"; - editedCabalFile = "1izlsx427d3c485hlfi1agb2c7gmbnp43736694ia72y1vkcfvh0"; + version = "0.2.2"; + sha256 = "17smxridqmbj1ic2b25kv1byr07lw6phqa1jx98a5yccflwhvmq4"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -168063,46 +168684,25 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , primitive, QuickCheck, quickcheck-unicode, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "json-stream"; - version = "0.4.4.2"; - sha256 = "12xchk8dpkr971h5ncwxhh97i8af2fp2rvgxvkg0d3a2ksbfpkal"; - libraryHaskellDepends = [ - aeson base bytestring primitive scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory hspec primitive QuickCheck - quickcheck-unicode scientific text unordered-containers vector - ]; - description = "Incremental applicative JSON parser"; - license = lib.licenses.bsd3; - }) {}; - - "json-stream_0_4_5_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hspec, primitive, QuickCheck, quickcheck-unicode, scientific , text, unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.5.0"; - sha256 = "1363nn38g8jdbrrmsx4ia1spqlyf49rvwrhm0rfxx97srx7nc0wy"; + version = "0.4.5.2"; + sha256 = "1hhnv59zwphvnfi6wym4bmqkcnk3b2adni4hxxgslmmf8yqi98ih"; libraryHaskellDepends = [ aeson base bytestring containers primitive scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory hspec primitive QuickCheck - quickcheck-unicode scientific text unordered-containers vector + aeson base bytestring containers directory hspec primitive + QuickCheck quickcheck-unicode scientific text unordered-containers + vector ]; description = "Incremental applicative JSON parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "json-syntax" = callPackage @@ -169135,6 +169735,24 @@ self: { license = lib.licenses.mit; }) {}; + "k8s-wrapper" = callPackage + ({ mkDerivation, async, base, http-client, http-types, lens, stm + , tasty, tasty-hunit, text, wai, wai-middleware-prometheus, warp + }: + mkDerivation { + pname = "k8s-wrapper"; + version = "0.1.0.0"; + sha256 = "183sv3jj361wk0qm6wfzq42rbrkr4m99cqpd2z489xlsxwlqagn9"; + libraryHaskellDepends = [ + async base http-types stm text wai wai-middleware-prometheus warp + ]; + testHaskellDepends = [ + async base http-client http-types lens stm tasty tasty-hunit text + ]; + description = "Application wrapper for the k8s environment"; + license = lib.licenses.mpl20; + }) {}; + "kademlia" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck @@ -170133,6 +170751,24 @@ self: { broken = true; }) {}; + "keelung" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , deepseq, directory, galois-field, groups, mtl, process + , QuickCheck, random, semirings, vector, wl-pprint-text + }: + mkDerivation { + pname = "keelung"; + version = "0.9.2"; + sha256 = "1hafnl78mvjp6yfncnvymjdvh4m10wm3gca8xmw0ry0qpii6ljmx"; + libraryHaskellDepends = [ + array base bytestring cereal containers deepseq directory + galois-field groups mtl process QuickCheck random semirings vector + wl-pprint-text + ]; + description = "DSL for creating zero-knowledge proofs"; + license = lib.licenses.asl20; + }) {}; + "keenser" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , fast-logger, hedis, hostname, lifted-base, monad-control @@ -172490,18 +173126,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "2.0.0.3"; - sha256 = "0drcq03vsya11002wg7i3phbgyylcyx4zry3ixflffm8sz00smci"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_4" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -172511,7 +173135,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -172611,24 +173234,24 @@ self: { "lambda-calculator" = callPackage ({ mkDerivation, base, bytestring, containers, hlint, hspec, HUnit - , mtl, optparse-applicative, parsec, prettyprinter, repline, rio - , text + , microlens, mtl, optparse-applicative, parsec, prettyprinter + , repline, rio, text }: mkDerivation { pname = "lambda-calculator"; - version = "3.0.0.1"; - sha256 = "1830xqgr7fy4bbdys27qcq6qa1r83ajx0dl0vjx46gmccdm5fjmq"; + version = "3.1.1.0"; + sha256 = "0cwpc9wqgcx1109g1c7949jknzrlvbkqc9n6851gmj03d74vkqc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers mtl parsec prettyprinter rio + base containers microlens mtl parsec prettyprinter rio ]; executableHaskellDepends = [ - base bytestring containers mtl optparse-applicative prettyprinter - repline rio text + base bytestring containers microlens mtl optparse-applicative + prettyprinter repline rio text ]; testHaskellDepends = [ - base containers hlint hspec HUnit mtl prettyprinter rio + base containers hlint hspec HUnit microlens mtl prettyprinter rio ]; description = "A lambda calculus interpreter"; license = lib.licenses.mit; @@ -173520,23 +174143,32 @@ self: { }) {}; "landlock" = callPackage - ({ mkDerivation, async, base, exceptions, filepath, process, psx - , QuickCheck, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, unix + ({ mkDerivation, async, base, directory, exceptions, filepath + , markdown-unlit, optparse-applicative, process, psx, QuickCheck + , quickcheck-classes-base, tasty, tasty-hunit, tasty-quickcheck + , temporary, unix }: mkDerivation { pname = "landlock"; - version = "0.2.0.1"; - sha256 = "1xn517if819v7qrazq0dx7mmgn9i996j1lmxrkb68rmflbg2wic1"; + version = "0.2.1.1"; + sha256 = "1ijwa0nd2fli7mjv7p0586j7hmgb1v0zv7nqjvygqqdl6qc9qidl"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base exceptions psx unix ]; - testHaskellDepends = [ - async base filepath process QuickCheck tasty tasty-expected-failure - tasty-hunit tasty-quickcheck + executableHaskellDepends = [ + base exceptions optparse-applicative unix ]; + testHaskellDepends = [ + async base directory filepath process QuickCheck + quickcheck-classes-base tasty tasty-hunit tasty-quickcheck + temporary + ]; + testToolDepends = [ markdown-unlit ]; doHaddock = false; description = "Haskell bindings for the Linux Landlock API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "landlocked"; }) {}; "lang" = callPackage @@ -175553,27 +176185,27 @@ self: { "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, exceptions, extra - , generic-lens, hashtables, hedis, http-client, http-client-tls - , http-types, HUnit, iso8601-time, lens, lrucache, monad-logger - , mtl, pcre-light, random, retry, scientific, semver, text, time - , unordered-containers, uuid, vector, yaml + , generic-lens, hashtables, http-client, http-client-tls + , http-types, HUnit, iso8601-time, lens, lrucache, memory + , monad-logger, monad-loops, mtl, pcre-light, random, scientific + , semver, text, time, unordered-containers, uuid, vector, yaml }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.1.1"; - sha256 = "0yvj44a8h4gg5wsyypcfyjy1aanw3bdiv5hpx0wlz4ahp6s7s84w"; + version = "4.0.0"; + sha256 = "1sq5sl0m2nnzh23rvwknmkbxmrvyiik0rlqh4fhzbirm8h0si44b"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash exceptions extra generic-lens hashtables hedis - http-client http-client-tls http-types iso8601-time lens lrucache - monad-logger mtl pcre-light random retry scientific semver text - time unordered-containers uuid vector yaml + cryptohash exceptions extra generic-lens hashtables http-client + http-client-tls http-types iso8601-time lens lrucache memory + monad-logger monad-loops mtl pcre-light random scientific semver + text time unordered-containers uuid vector yaml ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash exceptions extra generic-lens hashtables hedis - http-client http-client-tls http-types HUnit iso8601-time lens - lrucache monad-logger mtl pcre-light random retry scientific semver + cryptohash exceptions extra generic-lens hashtables http-client + http-client-tls http-types HUnit iso8601-time lens lrucache memory + monad-logger monad-loops mtl pcre-light random scientific semver text time unordered-containers uuid vector yaml ]; description = "Server-side SDK for integrating with LaunchDarkly"; @@ -175582,6 +176214,26 @@ self: { broken = true; }) {}; + "launchdarkly-server-sdk-redis-hedis" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, generic-lens + , hedis, HUnit, launchdarkly-server-sdk, text + }: + mkDerivation { + pname = "launchdarkly-server-sdk-redis-hedis"; + version = "1.0.0"; + sha256 = "1417pxkpgd0ayz25zclp2r3yza6qy74f1y7ffwqqlaqh07blpgqm"; + libraryHaskellDepends = [ + aeson base bytestring exceptions generic-lens hedis + launchdarkly-server-sdk text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions generic-lens hedis HUnit + launchdarkly-server-sdk text + ]; + description = "LaunchDarkly Server-Side SDK - Redis Integration"; + license = lib.licenses.asl20; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -176843,7 +177495,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "lens_5_2" = callPackage + "lens_5_2_1" = callPackage ({ mkDerivation, array, assoc, base, base-compat, base-orphans , bifunctors, bytestring, call-stack, comonad, containers , contravariant, criterion, deepseq, distributive, exceptions @@ -176857,8 +177509,8 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.2"; - sha256 = "126ivkkcacd15899phrwq6zc6zwllnshplkrrf59x3a6vsz2wgmk"; + version = "5.2.1"; + sha256 = "0vr6wpq6g8cc24dqi5qzslhkkq1l99pzk8yd7vl3r2i5wyfw3l82"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -177200,13 +177852,13 @@ self: { }) {}; "lens-sop" = callPackage - ({ mkDerivation, base, fclabels, generics-sop, transformers }: + ({ mkDerivation, base, generics-sop, optics-core, transformers }: mkDerivation { pname = "lens-sop"; - version = "0.2.0.3"; - sha256 = "0vgh6bj43qmhca6ij4b0bxqirhhfvxqd7xx5pryfs79fjghc47vv"; + version = "0.3.0"; + sha256 = "145yplksxyk15fyhjssjy5f4z18h1d8bgf25pb1vqdfr10rnffi1"; libraryHaskellDepends = [ - base fclabels generics-sop transformers + base generics-sop optics-core transformers ]; description = "Computing lenses generically using generics-sop"; license = lib.licenses.bsd3; @@ -179271,8 +179923,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.7.1"; - sha256 = "1apzp7pkd2vl7nxmdcmdnpa89wrs1fmaii8gd01bjcmjkk7qxgli"; + version = "0.8.0"; + sha256 = "0zkc0575i87ii8izz0fsvd959wkxfacz36ng7msb25ld8byhsh1g"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -179430,12 +180082,12 @@ self: { "lima" = callPackage ({ mkDerivation, aeson, base, data-default, optparse-applicative - , yaml + , string-interpolate, yaml }: mkDerivation { pname = "lima"; - version = "0.1.0.5"; - sha256 = "10hanr88zbrx57c52rmzmvqqn35yhylpzms0j60j195zwxmaliq6"; + version = "0.1.0.6"; + sha256 = "1hwpfdf9a9bdj0ya5mgi4mql9d6cyx06vhl0039lvx6nhzm6xlkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179445,7 +180097,8 @@ self: { aeson base data-default optparse-applicative yaml ]; testHaskellDepends = [ - aeson base data-default optparse-applicative yaml + aeson base data-default optparse-applicative string-interpolate + yaml ]; description = "(Haskell or Literate Haskell) <-> Markdown converter"; license = lib.licenses.mit; @@ -179838,23 +180491,6 @@ self: { }) {}; "linear-generics" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "linear-generics"; - version = "0.2"; - sha256 = "16l117m3zblla1cn5866mknvhc1s9737qhld6bym4xsyqsgvh2sz"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "linear-generics_0_2_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -179869,7 +180505,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-grammar" = callPackage @@ -187155,6 +187790,36 @@ self: { license = lib.licenses.mit; }) {}; + "marching-cubes" = callPackage + ({ mkDerivation, array, base, containers, extra, linear, matrix + , split, vector + }: + mkDerivation { + pname = "marching-cubes"; + version = "0.1.0.0"; + sha256 = "08147kvsw6g2kkbbicax26y06bjrsiar1cffapwnqd8fwcg99gxs"; + libraryHaskellDepends = [ + array base containers extra linear matrix split vector + ]; + description = "Marching Cubes"; + license = lib.licenses.bsd3; + }) {}; + + "marching-cubes2" = callPackage + ({ mkDerivation, base, containers, extra, linear, matrix, split + , vector + }: + mkDerivation { + pname = "marching-cubes2"; + version = "0.1.0.0"; + sha256 = "0p2dcaivxrvvm0jpw7rqlinmhyivkyc6v1wxk8fn9xj155y9djm2"; + libraryHaskellDepends = [ + base containers extra linear matrix split vector + ]; + description = "Marching Cubes"; + license = lib.licenses.bsd3; + }) {}; + "marihana" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -189457,6 +190122,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "megastore" = callPackage + ({ mkDerivation, adjunctions, base, binary, bytestring, containers + , directory, ghc, hashable, JuicyPixels, lens, mtl, random, text + , text-show, vector, zlib + }: + mkDerivation { + pname = "megastore"; + version = "0.1.1.1"; + sha256 = "0i34jla7v5fsqcnpy8h7iqy413p6qcqnc1z1yi933kdwsh6srdyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + adjunctions base binary bytestring containers directory ghc + hashable JuicyPixels lens mtl random text text-show vector zlib + ]; + executableHaskellDepends = [ + adjunctions base binary bytestring containers directory ghc + hashable JuicyPixels lens mtl random text text-show vector zlib + ]; + description = "Bulk image or strict bytestring storage"; + license = lib.licenses.bsd3; + mainProgram = "megastore"; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -196069,8 +196758,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.2.1"; - sha256 = "04qm3zzj880d89dk36pd5n9hll5a2m15zvmvr7j8wgi30hrp2691"; + version = "0.0.2.6"; + sha256 = "048zic4pkgdcrawg9npj8jdbd38d3qal45gdb6abxmcjqi5zapsg"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -196085,21 +196774,17 @@ self: { "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-discover, ilist, lens, monomer - , mtl, random, stm, text, time + , mtl, stm, text }: mkDerivation { pname = "monomer-hagrid"; - version = "0.2.1.0"; - sha256 = "1hgw5p8nfw12jklrd2blli0wc4z9b60bk9gf3j0l8jxpivzwakqd"; + version = "0.2.1.1"; + sha256 = "0b5xr7pzppv3lds28l5gzh56lw4s6v7qlx624ma076vg61rxxkl2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-default-class ilist lens monomer text ]; - executableHaskellDepends = [ - base containers data-default-class ilist lens monomer random text - time - ]; testHaskellDepends = [ base bytestring containers data-default data-default-class hspec ilist lens monomer mtl stm text @@ -199319,10 +200004,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "multiset-comb"; - version = "0.2.4.1"; - sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; - revision = "1"; - editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; + version = "0.2.4.2"; + sha256 = "0vgwahb6v1hm2vrlma3qv25xz2h2gq6dv4xwbngbkmvihx18r4rd"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = lib.licenses.bsd3; @@ -204347,6 +205030,17 @@ self: { broken = true; }) {}; + "newline" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "newline"; + version = "0.0.1.0"; + sha256 = "1lnrcpbj5sqgqxg41hf3ppj4dz77jh978acni7ni1wqd3yycgh68"; + libraryHaskellDepends = [ base text ]; + description = "newline specifications as values"; + license = lib.licenses.bsd3; + }) {}; + "newports" = callPackage ({ mkDerivation, base, directory, old-time }: mkDerivation { @@ -206081,18 +206775,17 @@ self: { }) {}; "nonempty-vector" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest - , primitive, vector + ({ mkDerivation, base, deepseq, primitive, QuickCheck, tasty + , tasty-quickcheck, vector }: mkDerivation { pname = "nonempty-vector"; - version = "0.2.1.0"; - sha256 = "0w6fn8dinf8lcbhr5797i5kyixpasylpwn97ljmkjc6n3ad1b21y"; - revision = "1"; - editedCabalFile = "18w57f8sdix71a27gwbifw7hmg34lms22c99gp7i7j7g154f3cn3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.2.2.0"; + sha256 = "0nfvqp59jk8j0r4mj1v8q87hfznhkrscbgz2z7i7cva8fgqjrivg"; libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck vector + ]; description = "Non-empty vectors"; license = lib.licenses.bsd3; }) {}; @@ -211126,14 +211819,14 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: + ({ mkDerivation, base, mtl, random, transformers }: mkDerivation { pname = "operational"; - version = "0.2.4.1"; - sha256 = "0aa1pxymvkhbs0x03ikfiap2skzyf2z7307kz5adkmb3qmykcqa2"; + version = "0.2.4.2"; + sha256 = "1dx6vpmg21fskxyz12ba26hffk25b2qk9sznqfczgaamn6rahzc5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl ]; + libraryHaskellDepends = [ base mtl transformers ]; executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; @@ -211338,8 +212031,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "2"; - editedCabalFile = "1fl217q7s0g8a46p2smanhhdj0jqvc9n3lagcnpphkv3fzfgrcbz"; + revision = "3"; + editedCabalFile = "0hfx1ms0nmy57ik71r6bwlj3c5wwp48xf0mlr0pfi2c0wjl49azr"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -213774,7 +214467,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-crossref_0_3_15_0" = callPackage + "pandoc-crossref_0_3_15_1" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc @@ -213783,8 +214476,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.15.0"; - sha256 = "0kzxdpqkhm09vizsyb7ck0mnic32kci8plqlbsawdjkg4knvdn5r"; + version = "0.3.15.1"; + sha256 = "0a0qfqfcajidkwv8zbk8h0lhnzcwzvkbcynh6y5hs4b5k07gdl9y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -216646,32 +217339,6 @@ self: { }) {}; "password" = callPackage - ({ mkDerivation, base, base-compat, base64, bytestring, Cabal - , cabal-doctest, cryptonite, doctest, memory, password-types - , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "password"; - version = "3.0.2.0"; - sha256 = "092cryk5xsmq86l9i7yyjxrq83mi9q61grwdkw2n8c1dxijbdi8l"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base64 bytestring cryptonite memory password-types - template-haskell text - ]; - testHaskellDepends = [ - base base-compat bytestring cryptonite doctest memory - password-types QuickCheck quickcheck-instances scrypt tasty - tasty-hunit tasty-quickcheck template-haskell text - ]; - description = "Hashing and checking of passwords"; - license = lib.licenses.bsd3; - platforms = lib.platforms.x86; - maintainers = [ lib.maintainers.cdepillabout ]; - }) {}; - - "password_3_0_2_1" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, password-types , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit @@ -216694,7 +217361,6 @@ self: { description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -219500,8 +220166,8 @@ self: { pname = "persistent-mtl"; version = "0.5.0.1"; sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; - revision = "1"; - editedCabalFile = "1qhazc2jqrhz6bkhn55nsikgf8kdvajb2ai6826nwrq657glzqa4"; + revision = "2"; + editedCabalFile = "1aq30hqpdcsf7llmfwnn061qa2id4b8fncd9k0f53kmgvys2xivd"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -221106,19 +221772,21 @@ self: { }) {}; "phonetic-languages-simplified-properties-array" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn2-array - , phonetic-languages-basis, phonetic-languages-rhythmicity + ({ mkDerivation, base, lists-flines, logical-constraints + , mmsyn2-array, phonetic-languages-basis + , phonetic-languages-rhythmicity , phonetic-languages-simplified-base , phonetic-languages-simplified-properties-array-common , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.16.0.0"; - sha256 = "05zbdafl2hga04sy5vcq121n8aigbrhfb4xynvafbyxsmsahflkz"; + version = "0.17.1.0"; + sha256 = "1qnrb811wfhv9d6l0vkfzjwgp8zbxlbgkzv28if2g0za6j20b8d2"; libraryHaskellDepends = [ - base lists-flines mmsyn2-array phonetic-languages-basis - phonetic-languages-rhythmicity phonetic-languages-simplified-base + base lists-flines logical-constraints mmsyn2-array + phonetic-languages-basis phonetic-languages-rhythmicity + phonetic-languages-simplified-base phonetic-languages-simplified-properties-array-common ukrainian-phonetics-basic-array ]; @@ -226232,24 +226900,6 @@ self: { }) {}; "pooled-io" = callPackage - ({ mkDerivation, base, concurrent-split, containers, deepseq - , transformers, unsafe, utility-ht - }: - mkDerivation { - pname = "pooled-io"; - version = "0.0.2.2"; - sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base concurrent-split containers deepseq transformers unsafe - utility-ht - ]; - description = "Run jobs on a limited number of threads and support data dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "pooled-io_0_0_2_3" = callPackage ({ mkDerivation, base, concurrent-split, containers, deepseq , transformers, unsafe, utility-ht }: @@ -226265,7 +226915,6 @@ self: { ]; description = "Run jobs on a limited number of threads and support data dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pop3-client" = callPackage @@ -229984,20 +230633,18 @@ 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 + "primitive_0_8_0_0" = callPackage + ({ mkDerivation, base, base-orphans, data-array-byte, 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"; - revision = "1"; - editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62"; + version = "0.8.0.0"; + sha256 = "0pwr5g3bra5m2zjm14pj98klqj2qrjcfasgd3rcrp7vq98dw4lsm"; libraryHaskellDepends = [ - base deepseq template-haskell transformers + base data-array-byte deepseq template-haskell transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -230017,6 +230664,8 @@ self: { pname = "primitive-addr"; version = "0.1.0.2"; sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; + revision = "1"; + editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = lib.licenses.bsd3; @@ -230094,8 +230743,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.5"; - sha256 = "0xmigva8lss9h18q0a63mc9sridny40nyzkizr2vmgm5d9qniqjs"; + version = "0.10.1.6"; + sha256 = "1lxb5yfpxj038fs7l5jjj3i4k9frjnlbki5kjgf0mbpcyfv6s0rr"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -230245,6 +230894,8 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.2"; sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; + revision = "1"; + editedCabalFile = "1kndcxl120bl0wzjjd8s2nxcw4qw5y3q6vzdqxn8p4xblk1vxajk"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; @@ -230257,6 +230908,8 @@ self: { pname = "primitive-unlifted"; version = "0.1.3.1"; sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb"; + revision = "1"; + editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf"; libraryHaskellDepends = [ base bytestring primitive text-short ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; @@ -230626,20 +231279,6 @@ self: { }) {}; "probability" = callPackage - ({ mkDerivation, base, containers, random, transformers, utility-ht - }: - mkDerivation { - pname = "probability"; - version = "0.2.7"; - sha256 = "1m494ya9yv25jdi9wm90zz8c16vq1kv73sgc6w3950020hsbfqj9"; - libraryHaskellDepends = [ - base containers random transformers utility-ht - ]; - description = "Probabilistic Functional Programming"; - license = lib.licenses.bsd3; - }) {}; - - "probability_0_2_8" = callPackage ({ mkDerivation, base, containers, random, transformers, utility-ht }: mkDerivation { @@ -230651,7 +231290,6 @@ self: { ]; description = "Probabilistic Functional Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "probable" = callPackage @@ -232642,23 +233280,6 @@ self: { }) {}; "protolude" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text - , transformers, transformers-compat - }: - mkDerivation { - pname = "protolude"; - version = "0.3.2"; - sha256 = "0i53yxg44nrz0czwr8cqhw1fdapz9db8kfnqz9a3lmj5skrikh3y"; - libraryHaskellDepends = [ - array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat stm text transformers transformers-compat - ]; - description = "A small prelude"; - license = lib.licenses.mit; - }) {}; - - "protolude_0_3_3" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text , transformers, transformers-compat @@ -232673,7 +233294,6 @@ self: { ]; description = "A small prelude"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -233059,11 +233679,11 @@ self: { ({ mkDerivation, async, base, tasty, tasty-hunit }: mkDerivation { pname = "psx"; - version = "0.1.0.0"; - sha256 = "1clxvv9qazq02307ay7acy17614407zhjm9p1139dfiqri1218ar"; + version = "0.1.1.1"; + sha256 = "0g46yjak9j49075gpinc6012vc2pdz0hix67gvz1daqz69wg7x1z"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base tasty tasty-hunit ]; - description = "Integrate @libpsx@ with the GHC RTS"; + description = "Integrate libpsx with the GHC RTS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -233194,14 +233814,14 @@ self: { license = lib.licenses.mit; }) {}; - "ptr-poker_0_1_2_12" = callPackage + "ptr-poker_0_1_2_13" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog , isomorphism-class, numeric-limits, rerebase, scientific, text }: mkDerivation { pname = "ptr-poker"; - version = "0.1.2.12"; - sha256 = "07mhsg8xr2xyxg7bzmv4cb41c3919my3j70q3bjplqvfxsan9n0y"; + version = "0.1.2.13"; + sha256 = "07j9iszxv3c0yw3lm8zlf1wl34imr3r828fc8jg047rr28yxy2kg"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog isomorphism-class numeric-limits rerebase @@ -235744,6 +236364,8 @@ self: { pname = "quickcheck-classes"; version = "0.6.5.0"; sha256 = "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"; + revision = "1"; + editedCabalFile = "1p52n2padxppj4wy3s4v8shs7zsd9hy9r4rdk21wg7l9dwbqss5a"; libraryHaskellDepends = [ aeson base containers primitive primitive-addr QuickCheck quickcheck-classes-base semigroupoids semirings transformers vector @@ -235865,6 +236487,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_29_1" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, data-array-byte, data-fix, hashable + , integer-logarithms, old-time, OneTuple, primitive, QuickCheck + , scientific, splitmix, strict, tagged, text, text-short, these + , time, time-compat, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.29.1"; + sha256 = "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers data-array-byte + data-fix hashable integer-logarithms old-time OneTuple primitive + QuickCheck scientific splitmix strict tagged text text-short these + time time-compat transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + base containers data-array-byte primitive QuickCheck tagged + uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -236193,17 +236844,6 @@ self: { }) {}; "quickcheck-transformer" = callPackage - ({ mkDerivation, base, QuickCheck, random, transformers }: - mkDerivation { - pname = "quickcheck-transformer"; - version = "0.3.1.1"; - sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j"; - libraryHaskellDepends = [ base QuickCheck random transformers ]; - description = "A GenT monad transformer for QuickCheck library"; - license = lib.licenses.mit; - }) {}; - - "quickcheck-transformer_0_3_1_2" = callPackage ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; @@ -236212,7 +236852,6 @@ self: { libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-unicode" = callPackage @@ -237477,19 +238116,6 @@ self: { }) {}; "rampart" = callPackage - ({ mkDerivation, base, criterion, hspec }: - mkDerivation { - pname = "rampart"; - version = "2.0.0.3"; - sha256 = "1g6297vfsa61ygywsc906p5449nzljldl3bbf2jags79b6qwa15n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_4" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; @@ -237499,7 +238125,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -238413,27 +239038,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; - version = "2.0.0.4"; - sha256 = "0iwdj9bmv3k7ppq51z66z1h8rrsi6jcc6xpdf5b8c869fazy6nd4"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, uuid @@ -238452,25 +239056,9 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "2.0.0.1"; - sha256 = "0hh99f7dwl5gihgqjn627s6sn4p68h1lifl2m8qqlhhdnnbwy4lr"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -238483,7 +239071,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -239924,6 +240511,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_18" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.18"; + sha256 = "07i5kkzwlgbdz1xikhn9smmv3ac65z3xzs1wflxrbf6v9fa77s5y"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -239936,26 +240545,6 @@ self: { }) {}; "rec-def" = callPackage - ({ mkDerivation, base, concurrency, containers, dejafu, doctest - , QuickCheck, random, tasty, tasty-dejafu, template-haskell - }: - mkDerivation { - pname = "rec-def"; - version = "0.2"; - sha256 = "0dfw86ws00gsdnzb238pmr4i2lyfp405lp70nbak45qq2cbz0zj8"; - revision = "1"; - editedCabalFile = "0kg2m81b4q73m8rysnqkmviiph1vf68f2dhyzawi9b2mj22q45fz"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base concurrency containers dejafu doctest QuickCheck random tasty - tasty-dejafu template-haskell - ]; - description = "Recursively defined values"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.nomeata ]; - }) {}; - - "rec-def_0_2_1" = callPackage ({ mkDerivation, base, concurrency, containers, dejafu, doctest , QuickCheck, random, tasty, tasty-dejafu, template-haskell }: @@ -239970,7 +240559,6 @@ self: { ]; description = "Recursively defined values"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.nomeata ]; }) {}; @@ -240305,6 +240893,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "recursion-schemes_5_2_2_4" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, data-fix + , free, HUnit, template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.2.2.4"; + sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; + libraryHaskellDepends = [ + base base-orphans comonad containers data-fix free template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -241053,6 +241659,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflection_2_1_7" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "reflection"; + version = "2.1.7"; + sha256 = "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -243784,6 +244406,30 @@ self: { license = lib.licenses.mit; }) {}; + "relude_1_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "1.2.0.0"; + sha256 = "0wqj5ipsm3wwl401q5c5w6q6q07qd825y2d10j3q9gqsvyrpgqfb"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ + base tasty-bench unordered-containers + ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -244870,6 +245516,18 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_18" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.18"; + sha256 = "1y5xklpm2l92wfa1h4h5s78hks36n79b1ncvr46ljf545gywmp4m"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -245770,6 +246428,8 @@ self: { pname = "retrie"; version = "1.2.1.1"; sha256 = "1axz2kdp6ljwiy8zvj33r6dbhgcglf0qlcq4s5f4bx4djsqwgavl"; + revision = "1"; + editedCabalFile = "1j5ppfzdcqbnik6cccqlwb62496z473y26r2ad763q0l5v6lhqfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245952,8 +246612,8 @@ self: { ({ mkDerivation, base, containers, contiguous, deepseq }: mkDerivation { pname = "reverse-list"; - version = "0.2.0"; - sha256 = "0r4bjrc1vksx3j61qb0g1a7nngkzvsybr0v0admls3ffqf3y4zgh"; + version = "0.3.0.0"; + sha256 = "0q3fjgbc6r0v7zdcs577jilqc0py6vmr4iyvnngdlwhrcvyv4mjs"; libraryHaskellDepends = [ base containers contiguous deepseq ]; description = "reversed lists/snoc lists"; license = lib.licenses.bsd3; @@ -246426,6 +247086,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "rhythmic-sequences" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rhythmic-sequences"; + version = "0.1.3.0"; + sha256 = "1m74z445zjfimc8b7ga9y1jyp8v2hrirpd2ynh89dz6iwxbbkq5k"; + libraryHaskellDepends = [ base ]; + description = "Library to deal with rhythmicity of short sequences"; + license = lib.licenses.mit; + }) {}; + "riak" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion @@ -248843,6 +249514,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "rrb-vector_0_2_0_0" = callPackage + ({ mkDerivation, base, deepseq, indexed-traversable, nothunks + , primitive, quickcheck-classes-base, tasty, tasty-bench + , tasty-quickcheck + }: + mkDerivation { + pname = "rrb-vector"; + version = "0.2.0.0"; + sha256 = "17lmf79dzynpw43ibs7xzq31bvim5wj7a91k5h3bdzwjwwh1sy0x"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive + ]; + testHaskellDepends = [ + base deepseq nothunks quickcheck-classes-base tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Efficient RRB-Vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -249311,6 +250004,8 @@ self: { pname = "run-st"; version = "0.1.1.0"; sha256 = "11if8xwv22ry0mxrglg3pcx3cx8ljnq56f3m9vjkr9jcj2881dvf"; + revision = "1"; + editedCabalFile = "15cm4zv9848sa2a2ipb66lv791pdnkx7j3pwksmjvkhkzr3bkl51"; libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; license = lib.licenses.bsd3; @@ -250503,8 +251198,8 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.2.0.1"; - sha256 = "181fxlp8p0zhz58h23fxavhcbxkwhd3a3idlbhawb2rhiah6fs6f"; + version = "0.2.1.0"; + sha256 = "1n9wjqgmb0rdk3fp5mva413646qi2cj7i21k80797xycyrx3v2xa"; libraryHaskellDepends = [ base bytestring deepseq hashable profunctors text ]; @@ -250542,18 +251237,6 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; - version = "2.0.0.1"; - sha256 = "0g2y0ng0s3hp9scp080m933yixhl3zd8bsjvyf2k0pn9b9cg0p79"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_2" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; @@ -250563,7 +251246,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -251065,6 +251747,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sasha" = callPackage + ({ mkDerivation, aeson, alex, array, base, bytestring, containers + , deepseq, lattices, QuickCheck, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-letrec, wide-word + }: + mkDerivation { + pname = "sasha"; + version = "0"; + sha256 = "0c7wvrw5139d4n9vj5na7j3l4ayk5651w7qf962hd0cb1ah77518"; + libraryHaskellDepends = [ + base bytestring containers lattices QuickCheck template-haskell + th-letrec wide-word + ]; + testHaskellDepends = [ + aeson array base bytestring deepseq lattices tasty tasty-bench + tasty-hunit tasty-quickcheck text + ]; + testToolDepends = [ alex ]; + description = "A staged lexer generator"; + license = lib.licenses.bsd3; + }) {}; + "sasl" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , monads-tf, papillon, simple-pipe @@ -251373,7 +252077,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_11_0" = callPackage + "sbp_4_12_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -251382,8 +252086,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.11.0"; - sha256 = "0flwy85dvdmaqpl8b652as8zhdypq0a513v1pvp0hrnp1z0ylg1p"; + version = "4.12.0"; + sha256 = "16y2bi153d1gbsznai75dli5fww3ysyfp39d7srkffvmwjal3ckd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252397,8 +253101,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "3"; - editedCabalFile = "1n67w1b64q59nn4845z3kr8rm0x0p7bi3cyp6n1dpnfs8k4l8x2i"; + revision = "4"; + editedCabalFile = "0667wh94s1sibpp7i7gkcys4b2lc6mwyza11ijaqbbv2gw51liap"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -256263,8 +256967,8 @@ self: { pname = "servant-docs"; version = "0.12"; sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; - revision = "3"; - editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz"; + revision = "4"; + editedCabalFile = "1yb9axh316dnlqhyxafyl6d3yh1x5skh94mpm8z534xji6n2kpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256357,30 +257061,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec - , HUnit, lens, servant, servant-client, servant-foreign, text - , wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.7.2"; - sha256 = "1hn7qkz4aw5snc4lbprbshzr3dagfry1bms0fx9bfif61312swqy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory elm-bridge lens servant servant-foreign text - wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-bridge hspec HUnit servant servant-client text - ]; - description = "Automatically derive Elm functions to query servant webservices"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-elm_0_7_3" = callPackage ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec , HUnit, lens, servant, servant-client, servant-foreign, text , wl-pprint-text @@ -260699,7 +261379,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "shelly_1_11_0" = callPackage + "shelly_1_12_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process @@ -260707,8 +261387,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.11.0"; - sha256 = "0vmi8qbp1w9ir25k2p05p4jx9r7v67kkyygygl660ji6l6a89h50"; + version = "1.12.0"; + sha256 = "17mxarrz2jhrj7vf5nappxixkn8dqsnz6fgrxfzbg9z0gk95hrig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -264148,17 +264828,6 @@ self: { }) {}; "skylighting-format-context" = callPackage - ({ mkDerivation, base, containers, skylighting-core, text }: - mkDerivation { - pname = "skylighting-format-context"; - version = "0.1.0.1"; - sha256 = "1d4nf16wl2l4r627qnph09x21xwcq03r7bznqm08d4di1z241xv0"; - libraryHaskellDepends = [ base containers skylighting-core text ]; - description = "ConTeXt formatter for skylighting syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-format-context_0_1_0_2" = callPackage ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { pname = "skylighting-format-context"; @@ -264167,7 +264836,6 @@ self: { libraryHaskellDepends = [ base containers skylighting-core text ]; description = "ConTeXt formatter for skylighting syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-format-latex" = callPackage @@ -268038,6 +268706,21 @@ self: { broken = true; }) {}; + "sorting-network" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, QuickCheck + , template-haskell, vector + }: + mkDerivation { + pname = "sorting-network"; + version = "0.1.0.0"; + sha256 = "1rrihqjrj4jnh3950illxb6yva092cz86xkhmr5p34wzpbz1vrpx"; + libraryHaskellDepends = [ base template-haskell vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion mwc-random ]; + description = "Sort small lists with sorting network"; + license = lib.licenses.asl20; + }) {}; + "sorty" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -271026,8 +271709,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.4.0.1"; - sha256 = "0aw5bx737cg0isdnnrhlwba0ddjki57p4ygav4piv5d3ffzhrfzm"; + version = "0.4.1"; + sha256 = "11s886069z75abp7x0iqvbjfn4hhkzjj5d0mxbljwcfw6v8mq8c4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -272199,19 +272882,6 @@ self: { }) {}; "statestack" = callPackage - ({ mkDerivation, base, mtl, transformers }: - mkDerivation { - pname = "statestack"; - version = "0.3.1"; - sha256 = "0h8kwzf117zb2ffc5phbvlxpgza8h59bjg93ndp7r1ks0jvs5lpr"; - revision = "1"; - editedCabalFile = "1bvx9s7zssczqpwwgqw4cgmfdw1wjy0mwqlndjgnkjjn4nm31ml8"; - libraryHaskellDepends = [ base mtl transformers ]; - description = "Simple State-like monad transformer with saveable and restorable state"; - license = lib.licenses.bsd3; - }) {}; - - "statestack_0_3_1_1" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "statestack"; @@ -272220,7 +272890,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "statethread" = callPackage @@ -273191,8 +273860,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.8"; - sha256 = "1p3njvg5sixsgk12rldmvgcj8flmh00w968mzaavxl4j4axd8x3c"; + version = "1.2.0.9"; + sha256 = "0dd06dzsap4bhc4h1il3cwsd5hcb23lrvq03pwxvd32wp6a4x98r"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -273575,10 +274244,8 @@ self: { }: mkDerivation { pname = "storable-record"; - version = "0.0.6"; - sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; - revision = "1"; - editedCabalFile = "0gmyc50r9nzfwr5iyiixascgkv2lvk7xccvimqv2ix4zyi2fwdad"; + version = "0.0.7"; + sha256 = "1c1f58v13nxpq2ix30d2kpvsamk44apl6ms1a2pq54fkjk44didy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273614,6 +274281,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-tuple_0_1" = callPackage + ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: + mkDerivation { + pname = "storable-tuple"; + version = "0.1"; + sha256 = "0g2rhqxrl1yjvvqwxmfgflgyyrds0kkcvzjjmwk07mir8aj4yjq3"; + libraryHaskellDepends = [ + base base-orphans storable-record utility-ht + ]; + description = "Storable instance for pairs and triples"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "storablevector" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, semigroups, syb, transformers @@ -274583,6 +275264,8 @@ self: { pname = "streamly"; version = "0.8.3"; sha256 = "0xjvrkyh8i6hkfr3vsi3n56z85qd56nyjiwi1abzhhdshvxw92xg"; + revision = "1"; + editedCabalFile = "1m8lhaabscgk0mj8hp0s8b7zb72padgqr39ky01cj0lxm7byxwf8"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions filepath fusion-plugin-types ghc-prim heaps lockfree-queue @@ -274645,8 +275328,8 @@ self: { pname = "streamly-bytestring"; version = "0.1.4"; sha256 = "1qwgrxm2x46951si18sbmqhq4fik26l07kmspv23m9q3drn0mklc"; - revision = "4"; - editedCabalFile = "1mzrj7bkmvz27svxjaknrgvxwvz9zpw0ifvpvdbi7idlfmh01mqa"; + revision = "5"; + editedCabalFile = "018v61bdrzbn3hgpyvzk1frs1pbj7i18w7ix1cij6r06qfgphsy8"; libraryHaskellDepends = [ base bytestring streamly ]; testHaskellDepends = [ base bytestring directory filepath hspec hspec-discover @@ -275925,23 +276608,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "6.0.0.4"; - sha256 = "1vvv1cc88niciqly68wddpkkly796jyl6hypahyd0rkif53q789l"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, template-haskell, text , time, transformers @@ -275956,7 +276622,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -276037,6 +276702,29 @@ self: { maintainers = [ lib.maintainers.raehik ]; }) {}; + "strongweak_0_4_1" = callPackage + ({ mkDerivation, base, either, generic-random, hspec + , hspec-discover, prettyprinter, QuickCheck, quickcheck-instances + , refined, vector, vector-sized + }: + mkDerivation { + pname = "strongweak"; + version = "0.4.1"; + sha256 = "0xns5l09h5sxz4sm2pgsgmrllccgp1lfp6v2mkfgbrfq2hgdgr0v"; + libraryHaskellDepends = [ + base either prettyprinter refined vector vector-sized + ]; + testHaskellDepends = [ + base either generic-random hspec prettyprinter QuickCheck + quickcheck-instances refined vector vector-sized + ]; + testToolDepends = [ hspec-discover ]; + description = "Convert between strong and weak representations of types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.raehik ]; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -276075,8 +276763,10 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1.7"; - sha256 = "072gbzxh0cnrdmbwmksqfrdvv7xhsamjrmgd6vya17md76mqndab"; + version = "0.1.8"; + sha256 = "07y8mahvvi2d3iggzxgrh8dbhg8zrjcamnf0x73ymrwxh0qhyryx"; + revision = "1"; + editedCabalFile = "1k4k41322zvmqw0812kip09gm6dhk441w3q0m59z2b5mlvmqr5qq"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -277512,6 +278202,8 @@ self: { pname = "supply-next"; version = "0.0.1.2"; sha256 = "110j4ppkw155hdlz00wbzc9z3m0mqf4dl6pqcaigcqg624m0ppqk"; + revision = "2"; + editedCabalFile = "1amw867flf8260zmrr0wyd50mri60641smqdb1blmc0knwdydlqd"; libraryHaskellDepends = [ base gambler integer-types quaalude supply-chain transformers ]; @@ -279727,8 +280419,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "1"; - editedCabalFile = "0ig8ysmw2hnbxgdv1p4h4vpyq782anw1g8wsqjrj6b0n4kazk5i8"; + revision = "2"; + editedCabalFile = "064a3xlqwl8v6q29djjcm0wx13wy1qw3p44v546amjbprk93kh1r"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -280254,15 +280946,15 @@ self: { }) {}; "systemd-socket-activation" = callPackage - ({ mkDerivation, base, containers, network, text, transformers - , unix + ({ mkDerivation, base, containers, network, quaalude, text + , transformers, unix }: mkDerivation { pname = "systemd-socket-activation"; - version = "1.0.0.2"; - sha256 = "1shqkxa8wgnx3bndy3qgykb4l0jsrp4qpwahgy9r6n98a1idbx0v"; + version = "1.1.0.1"; + sha256 = "0cmpwklq2jdn8ax8b27zlcf40wzrvnjghfzbkqfaq2711ln47w6q"; libraryHaskellDepends = [ - base containers network text transformers unix + base containers network quaalude text transformers unix ]; description = "Let systemd bind the server's socket for you"; license = lib.licenses.mit; @@ -281914,18 +282606,6 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.3.2"; - sha256 = "0j92ggsg3fqwkq9zgx94wqqi11yim4b7d1b2s1s24rdv6wy3sfn8"; - libraryHaskellDepends = [ base containers deepseq tasty ]; - benchmarkHaskellDepends = [ base ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_3_3" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: mkDerivation { pname = "tasty-bench"; @@ -281935,7 +282615,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-checklist" = callPackage @@ -283733,6 +284412,8 @@ self: { pname = "template-haskell-optics"; version = "0.2"; sha256 = "13jjycd2yirslab7j6gd1hfl9bn5srid4b2apdz36janxx8np4mm"; + revision = "1"; + editedCabalFile = "1asqpnrkwqgvjyc70hicfdjrf90d5h4yh9n2fljsmkjvay3w46r6"; libraryHaskellDepends = [ base containers optics-core template-haskell th-abstraction ]; @@ -284606,14 +285287,12 @@ self: { broken = true; }) {}; - "terminfo_0_4_1_5" = callPackage + "terminfo_0_4_1_6" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.5"; - sha256 = "0s0x5knl4hsmzlklabcd7c0m468gisg5cnf842wi1vfg8q922q5i"; - revision = "1"; - editedCabalFile = "0l731kh6dmf9q58kmr64kh6nmxl0r8sp1dhwr9apjyalnfp905sd"; + version = "0.4.1.6"; + sha256 = "0kx0q2ihnhk461hnkvy9g2nmdskqhik9vwqji8z741zy0az4mmb3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -285349,18 +286028,22 @@ self: { }) {}; "testcontainers" = callPackage - ({ mkDerivation, aeson, aeson-optics, base, bytestring, exceptions - , hspec, hspec-discover, mtl, network, optics-core, process - , resourcet, tasty, tasty-discover, tasty-hspec, tasty-hunit, text + ({ mkDerivation, aeson, aeson-optics, async, base, bytestring + , directory, exceptions, hspec, hspec-discover, http-client + , http-types, mtl, network, optics-core, process, random, resourcet + , tasty, tasty-discover, tasty-hspec, tasty-hunit, text , unliftio-core }: mkDerivation { pname = "testcontainers"; - version = "0.3.1.0"; - sha256 = "0gkspiz9vzaa02f6fnp6xv8xqgxnv73j50gh90z4hcbprcqgayk8"; + version = "0.5.0.0"; + sha256 = "06n02inh5ihbbpmlf7fjvq8idk4lrr8wsjbwarklh229azq99h7n"; + revision = "1"; + editedCabalFile = "19lxdf3hyhraf7ykx3cdv70j8rc9jx1ynfkjqpczm4pmp72pw06p"; libraryHaskellDepends = [ - aeson aeson-optics base bytestring exceptions mtl network - optics-core process resourcet tasty text unliftio-core + aeson aeson-optics async base bytestring directory exceptions + http-client http-types mtl network optics-core process random + resourcet tasty text unliftio-core ]; testHaskellDepends = [ base hspec tasty tasty-discover tasty-hspec tasty-hunit text @@ -285612,7 +286295,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text_2_0_1" = callPackage + "text_2_0_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, QuickCheck, tasty , tasty-bench, tasty-hunit, tasty-inspection-testing @@ -285620,8 +286303,8 @@ self: { }: mkDerivation { pname = "text"; - version = "2.0.1"; - sha256 = "1nl7l15qn2rh7p8hfrzs5djm3ms0gsb28r77hl530b0fqmk282mh"; + version = "2.0.2"; + sha256 = "1bggb4gq15r7z685w7c7hbm3w4n6day451ickz70d1l919jvwdf7"; libraryHaskellDepends = [ array base binary bytestring deepseq ghc-prim template-haskell ]; @@ -286411,6 +287094,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_10_1" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers, criterion + , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.10.1"; + sha256 = "1big5iflll2zijzfvnlyni91ir157iwyq08kpmk96qsgwdmxdkca"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + template-haskell text th-abstraction th-lift transformers + transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -286815,6 +287529,8 @@ self: { pname = "th-abstraction"; version = "0.4.5.0"; sha256 = "09hm0famyqsq09lal2ylnhsb31hybj8zanldi7cqncky4i7y5m80"; + revision = "1"; + editedCabalFile = "1hyjz6v788yiazhpkgcgipsvg52ik3w8jdpnajg0ayl1x5m1i3y2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -286823,6 +287539,21 @@ self: { license = lib.licenses.isc; }) {}; + "th-abstraction_0_5_0_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.5.0.0"; + sha256 = "0r4ri85283i1jjhd94wa9nps6cd9a8mh6rr4ds1gb2hqnwxdqn42"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -286987,6 +287718,8 @@ self: { pname = "th-desugar"; version = "1.14"; sha256 = "1b57v15xx0z0xjlijv61dh07p6rvfkdpxnxiaaa1iv7zyg2x7cnz"; + revision = "2"; + editedCabalFile = "16i6x4w286mhhkxzjid5pfbnn51dzyxq6brawlppqb15qbnvs744"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -287036,6 +287769,8 @@ self: { pname = "th-expand-syns"; version = "0.4.11.0"; sha256 = "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"; + revision = "1"; + editedCabalFile = "0kc4czr7bz5wl88fj11h02gn8fwr2azhw5z7ykil6lx7v1b42rg8"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -287235,6 +287970,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift_0_8_3" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.3"; + sha256 = "0xbbii04c60l6v6fnd50lldhpsg1ba03j1ff9bmyzpp7z3sppm95"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -288296,26 +289047,24 @@ self: { }) {}; "thyme" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , containers, cpphs, criterion, deepseq, directory, filepath, mtl - , old-locale, profunctors, QuickCheck, random - , system-posix-redirect, text, time, vector, vector-space - , vector-th-unbox + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , cpphs, criterion, deepseq, hashable, mtl, old-locale, profunctors + , QuickCheck, random, template-haskell, text, time, vector + , vector-space, vector-th-unbox }: mkDerivation { pname = "thyme"; - version = "0.3.5.5"; - sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; + version = "0.3.6"; + sha256 = "14qy25r4xascrsq497pzarcw5vhjyxvs1xmqwk2049dmnx6hwaw3"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq mtl old-locale - profunctors QuickCheck random text time vector vector-space - vector-th-unbox + aeson attoparsec base bytestring containers deepseq hashable mtl + old-locale profunctors QuickCheck random template-haskell text time + vector vector-space vector-th-unbox ]; libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath mtl - old-locale profunctors QuickCheck random system-posix-redirect text - time vector-space + attoparsec base bytestring containers mtl old-locale profunctors + QuickCheck random text time vector-space ]; benchmarkHaskellDepends = [ base criterion mtl old-locale profunctors QuickCheck random time @@ -288503,6 +289252,8 @@ self: { pname = "tidal"; version = "1.9.3"; sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; + revision = "1"; + editedCabalFile = "0lxx3zb26winf19wl44bs4bqrac1r4yf1j5i77bhnqgwrap426j1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -294455,6 +295206,8 @@ self: { pname = "tuples"; version = "0.1.0.0"; sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; + revision = "1"; + editedCabalFile = "06ns2npjh487pbzq6f5iwqvl0n9a6d5fywlm032nj3mxdmaynj2j"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck @@ -294608,8 +295361,8 @@ self: { pname = "turtle"; version = "1.6.1"; sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; - revision = "2"; - editedCabalFile = "0zkw1mn9z09gkc0yjx6pfqyvrda076qi7ya12vfd1j3b7yljhpdn"; + revision = "3"; + editedCabalFile = "00jxvvpffllwcaw2sg0rymj66963ihifpjn4m94mgscqwl25cfqs"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -296413,6 +297166,26 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process_0_2_11_0" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers, unliftio-core + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.11.0"; + sha256 = "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"; + libraryHaskellDepends = [ + async base bytestring process stm transformers unliftio-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers unliftio-core + ]; + description = "Run external processes, with strong typing of streams"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -299342,8 +300115,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "3"; - editedCabalFile = "1caqfajnhja7cz3bbz9pg2m9l3yc128hvsp7d3rpjw86g3wx2x0j"; + revision = "4"; + editedCabalFile = "1nay61awkq8w8v0bvqg7d187wzmylkj515q6glpw5n8nclp0imvk"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -299386,8 +300159,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.8.1"; - sha256 = "1193xyz1n8ma4l2p07g764zd87yzr3qv8lnfxhih7zh9r0lywd6y"; + version = "1.8.1.1"; + sha256 = "1cfz4h66jw0jh19vms4smga33hj9sc5s3xdaigi01wnaza7wl2di"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -299404,14 +300177,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_0_0" = callPackage + "unix_2_8_1_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , time }: mkDerivation { pname = "unix"; - version = "2.8.0.0"; - sha256 = "152b4ppl86s611m620bi16d24ymfm1xykakgdvw6xfqajgflhac8"; + version = "2.8.1.0"; + sha256 = "0zcsszs0vs2rvp5qzvflphgn4xbjqqbvlzdg0ci5sl4f1z5djnay"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "POSIX functionality"; @@ -299707,6 +300480,33 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_24_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck + , safe-exceptions, stm, time, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.24.0"; + sha256 = "16r2a26ig4j8crmvzbkbavszfaxghg7qhgm5z9q4aygc9jwbk2px"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process + safe-exceptions stm time transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck safe-exceptions stm time transformers unix + unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process + safe-exceptions stm time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -303047,8 +303847,8 @@ self: { pname = "vector"; version = "0.12.3.1"; sha256 = "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv"; - revision = "2"; - editedCabalFile = "0gkzrqcx5fymkxm92gy47qj0spj79ygv1vn7kfzdg7nn284x1yzz"; + revision = "3"; + editedCabalFile = "0n8w54d931k5s46ls4n7w40bs0gb839ijli9w6b9am0k1s1yigxb"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -303068,8 +303868,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "2"; - editedCabalFile = "19d6c1gp5d6v5wlg386aphn7893axba0zicpi7n5s4a55bqazs51"; + revision = "3"; + editedCabalFile = "0k14l1r84gxjv385crq8f1kvdcr4kjwyi4k7f64g6nksl60sqp7s"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -309678,6 +310478,22 @@ self: { broken = true; }) {}; + "weierstrass-functions" = callPackage + ({ mkDerivation, base, elliptic-integrals, gamma, jacobi-theta + , tasty, tasty-hunit + }: + mkDerivation { + pname = "weierstrass-functions"; + version = "0.1.0.0"; + sha256 = "03xh01zj60hhpq90amv1yml1cch38gni1zvgaji20wrhm17mjmpk"; + libraryHaskellDepends = [ + base elliptic-integrals gamma jacobi-theta + ]; + testHaskellDepends = [ base gamma tasty tasty-hunit ]; + description = "Weierstrass Elliptic Functions"; + license = lib.licenses.bsd3; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, deepseq, ghc, mtl, process, split, temporary }: @@ -310088,25 +310904,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable - , hedgehog, primitive, QuickCheck, quickcheck-classes, semirings - }: - mkDerivation { - pname = "wide-word"; - version = "0.1.4.0"; - sha256 = "1jajlkcbymf0jqmcbn46x3yxqxjslzdcnp1v582jjpa2glibsnf0"; - libraryHaskellDepends = [ - base deepseq ghc-prim hashable primitive - ]; - testHaskellDepends = [ - base bytestring ghc-prim hedgehog primitive QuickCheck - quickcheck-classes semirings - ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = lib.licenses.bsd2; - }) {}; - - "wide-word_0_1_5_0" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, hedgehog, primitive, QuickCheck, quickcheck-classes , semirings @@ -310115,6 +310912,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; + revision = "1"; + editedCabalFile = "0l2rhhj907fa4ydzd03li7g66fkmhk5iyzks1chc9d7wf4ddgplv"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -310124,7 +310923,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "wide-word-instances" = callPackage @@ -310538,8 +311336,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.1.6.0"; - sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; + version = "1.1.6.1"; + sha256 = "1n4kckgk5v63bpjgky3dfgyayl82hlnxzwaa99pzyxrcjkpql5ay"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -315597,8 +316395,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.10.0"; - sha256 = "01zylkpfrbwfbqxan9qywcjq6j6nks0pd6hjkah4lvr6vs9x4n38"; + version = "0.11.11.0"; + sha256 = "08q0b0qq98ip2v34lygdp2i0yc5cmny34w4w59fcsd71s85w15ac"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -315618,20 +316416,20 @@ self: { }) {}; "yaml-combinators" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop - , scientific, tasty, tasty-hunit, text, transformers - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, generics-sop, scientific + , tasty, tasty-hunit, text, transformers, unordered-containers + , vector, yaml }: mkDerivation { pname = "yaml-combinators"; - version = "1.1.2"; - sha256 = "0435m79lqah778g95ds628j5bilfggzyn9hzc309xh47h4mxl92m"; + version = "1.1.2.1"; + sha256 = "02ms9302p3jyvhina4f9sbndl9i4592xd4z1jsx9mbr9qpg6is4x"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base doctest tasty tasty-hunit text unordered-containers + aeson base tasty tasty-hunit text unordered-containers ]; description = "YAML parsing combinators for improved validation and error reporting"; license = lib.licenses.mit; @@ -315769,10 +316567,8 @@ self: { }: mkDerivation { pname = "yaml-streamly"; - version = "0.12.1"; - sha256 = "1rcv4y9f2p1biiaxh4j1wdq79ba1mi33yn5v6kds20am574ia1hq"; - revision = "1"; - editedCabalFile = "18gv1h6h9n8bmysdfb0h9kgifhi3rj9zf055l2dibaw0jixqqs2c"; + version = "0.12.2"; + sha256 = "0bjagj6bg884xchx8dkrhqikjmwqzpb8hkjlxvbxnsmsmwnc22cx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -315833,8 +316629,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.12"; - sha256 = "0wca4xqww3y1cvf6jshdk13nblg7byzyw7120yy8b2bgd3d0l42z"; + version = "0.1.0.13"; + sha256 = "0c7cnxlx01xjr992z0150dl1lnlyj2gwrqza7yhgmn4m7wg6r5z1"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -316660,8 +317456,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11"; - sha256 = "0fdahk5mc63g0zsafk8axry01qaxahmclpmmwygp2lhfsjy8mby2"; + version = "1.6.11.1"; + sha256 = "01ljcqmn0s79a77ry25q4333ni4w5swacah3rwhnhhrd5xnv1jxx"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -317338,8 +318134,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.1"; - sha256 = "1jbalzr3m92sfqladcpnvm6394qda0arhyzx7dychknssvbd2j3d"; + version = "1.6.24.2"; + sha256 = "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra From 50e7b4bfce7218d1700e3cc420d063ebfbfc04fe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 18:39:52 +0100 Subject: [PATCH 008/117] haskellPackages.haskell-gi: use hackage2nix generated 0.26.3 expr --- .../development/haskell-modules/configuration-common.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b52ea1afc10..e08dd156df44 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2242,15 +2242,10 @@ self: super: { # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; - # Temporarily upgrade haskell-gi until our hackage pin advances + # Temporarily upgrade haskell-gi until stackage advances # Fixes build of gi-harfbuzz with harfbuzz >= 7.0 # https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362 - haskell-gi = - assert super.haskell-gi.version == "0.26.2"; - overrideCabal { - version = "0.26.3"; - sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo="; - } super.haskell-gi; + haskell-gi = doDistribute self.haskell-gi_0_26_3; # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; From ed65e11bac2fde631de8b76a5dddef8aabef2761 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Mar 2023 18:40:23 +0100 Subject: [PATCH 009/117] haskellPackages.Cabal_3_8_1_0: drop obsolete override Revision 2 has been applied after the last hackage update. --- pkgs/development/haskell-modules/configuration-nix.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c38cd8ee4968..9d633d7a5297 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1053,15 +1053,12 @@ self: super: builtins.intersectAttrs super { hint = dontCheck super.hint; # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (overrideCabal (old: { - revision = assert old.revision == "1"; "2"; - editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; - }) (super.Cabal_3_8_1_0.override ({ + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_8_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_17_0; - }))); + })); # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed From 5a86855e006de9420ed5b2f799900bbefb691e53 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:23:03 +0100 Subject: [PATCH 010/117] haskell.packages.*: reflect terminfo update for cross compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit terminfo had a new release on hackage and we only ship the latest version currently, so every GHC gets the newest version. Whether this is correct, is another question, occurs to me – we'll have to look into whether we should fix this at some point. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index db5e18beef17..fac983969de3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -39,7 +39,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 92278ebb0e21..9b4abe34908f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -38,7 +38,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 389bbd308124..82e221af6c57 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -38,7 +38,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 6e347a76db0e..3ed8d155e8e0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -40,7 +40,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; 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 9fbeec03e4b5..3efd37a7758e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -40,7 +40,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index c95f0645b664..b5a741ecd0b6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -46,7 +46,7 @@ in { system-cxx-std-lib = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index b96526640bb0..2ad093ab9652 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -48,7 +48,7 @@ self: super: { stm = null; template-haskell = null; # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; text = null; time = null; transformers = null; From 74ff13b12d2762c997ab418f39e81a3fdd909298 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:24:50 +0100 Subject: [PATCH 011/117] haskellPackages.espial: drop upstreamed patch --- .../haskell-modules/configuration-common.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e08dd156df44..4615f305ec64 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1329,20 +1329,6 @@ self: super: { }) ] super.svgcairo; - # Espial is waiting for a hackage release to be compatible with GHC 9.X. - # [This issue](https://github.com/jonschoning/espial/issues/49) can be followed - # to track the status of the new release. - espial = - let ghc9-compat = fetchpatch { - url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; - sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; - excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; - }; - in overrideCabal (drv: { - jailbreak = assert super.espial.version == "0.0.11"; true; - patches = [ ghc9-compat ]; - }) super.espial; - # Upstream PR: https://github.com/jkff/splot/pull/9 splot = appendPatch (fetchpatch { url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch"; From 21b993296fbfd80543fbe14fa0ff6b093ba54502 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:41:56 +0100 Subject: [PATCH 012/117] haskellPackages: reflect haskelline 0.8.2 -> 0.8.2.1 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4615f305ec64..3e5a9b7fa8bd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1338,7 +1338,7 @@ self: super: { # Fails with encoding problems, likely needs locale data. # Test can be executed by adding which to testToolDepends and # $PWD/dist/build/haskeline-examples-Test to $PATH. - haskeline_0_8_2 = dontCheck super.haskeline_0_8_2; + haskeline_0_8_2_1 = doDistribute (dontCheck super.haskeline_0_8_2_1); # Too strict upper bound on HTF # https://github.com/nikita-volkov/stm-containers/issues/29 @@ -1529,7 +1529,7 @@ self: super: { # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2 hinit = doJailbreak (self.generateOptparseApplicativeCompletions [ "hi" ] - (super.hinit.override { haskeline = self.haskeline_0_8_2; })); + (super.hinit.override { haskeline = self.haskeline_0_8_2_1; })); # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 blas-hs = dontCheck super.blas-hs; From 7f2ac90596a220c22c28908f0e402d7b09a44951 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:57:34 +0100 Subject: [PATCH 013/117] haskell.packages.ghc94.primitive: 0.7.4.0 -> 0.8.0.0 Needs matching update of quickcheck-instances: haskell.packages.ghc94.quickcheck-instance: 0.3.28 -> 0.3.29.1 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index b5a741ecd0b6..41b26b1e9d2d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -99,7 +99,8 @@ in { parallel = doJailbreak super.parallel; path = doJailbreak super.path; polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); - primitive = dontCheck (doJailbreak self.primitive_0_7_4_0); + primitive = doDistribute self.primitive_0_8_0_0; + quickcheck-instances = doDistribute self.quickcheck-instances_0_3_29_1; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; From 295066c43d74b2ac73439dcc1d17639d2e55298b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:58:19 +0100 Subject: [PATCH 014/117] haskell.packages.ghc94.aeson: 2.1.1.0 -> 2.1.2.1 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 41b26b1e9d2d..b09cd1144125 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -71,7 +71,7 @@ in { # Jailbreaks & Version Updates - aeson = self.aeson_2_1_1_0; + aeson = doDistribute self.aeson_2_1_2_1; assoc = doJailbreak super.assoc; async = doJailbreak super.async; From 335f3cf3906b77a5e0d73dc435b4177c1f50a67d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 13:58:34 +0100 Subject: [PATCH 015/117] haskell.packages.ghc94.lens: 5.2 -> 5.2.1 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index b09cd1144125..8bfa2bf69a16 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -147,8 +147,7 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # lens >= 5.1 supports 9.2.1 - lens = doDistribute self.lens_5_2; + lens = doDistribute self.lens_5_2_1; # Apply patches from head.hackage. language-haskell-extract = appendPatch (pkgs.fetchpatch { From 28e1929fb013cea5aad7ad3ed8daa1cb34a5fe84 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 15:04:16 +0100 Subject: [PATCH 016/117] git-annex: update sha256 for 10.20230227 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3e5a9b7fa8bd..2295b3dd16f9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -132,7 +132,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1g1m18l7cx2y5d43k0vy5bqn4znybq0p345399zf9nkwhwhb7s20"; + sha256 = "0ngvdcvskrhdq4m19h4b1cq3jhbzx0bqay6hvsppk6cb2y4wkfd9"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From fa651582867b2ebd01d87472febcf539996d8e6b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Mar 2023 15:06:09 +0100 Subject: [PATCH 017/117] elmPackages.elm-format: reflect text 2.0.1 -> 2.0.2 --- pkgs/development/compilers/elm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 1005bd27469a..fe230c93918a 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -106,7 +106,7 @@ let elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; # elm-format requires text >= 2.0 - text = self.text_2_0_1; + text = self.text_2_0_2; # elm-format-lib requires hspec-golden < 0.2 hspec-golden = self.hspec-golden_0_1_0_3; # unorderd-container's tests indirectly depend on text < 2.0 From e9041742ff895927c20b1c3bf04b012184839ffc Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 3 Mar 2023 19:50:28 -0500 Subject: [PATCH 018/117] haskellPackages.drunken-bishop: unbreak (jail-break) As such, unbreak "diohs" (gemini client) transitive dependency and did some browsing with it. Seems to work fine. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2295b3dd16f9..fb050cf6721a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2105,6 +2105,7 @@ self: super: { "-p" "!/Test Rendering/" ] ++ drv.testFlags or []; }) super.morpheus-graphql; + drunken-bishop = doJailbreak super.drunken-bishop; # https://github.com/SupercedeTech/dropbox-client/issues/1 dropbox = overrideCabal (drv: { testFlags = [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6bcc4002cbc5..4ed05107d653 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1237,7 +1237,6 @@ broken-packages: - drmaa - drone - dropbox - - drunken-bishop - dsc - ds-kanren - dsmc diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 96818c6cceb5..2d76ef96daf4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1240,7 +1240,6 @@ dont-distribute-packages: - dingo-core - dingo-example - dingo-widgets - - diohsc - diplomacy-server - direct-rocksdb - directory-contents diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f5dd7a60f980..793cfe7965a0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -82460,7 +82460,6 @@ self: { ]; description = "Gemini client"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "diohsc"; }) {}; @@ -86942,8 +86941,6 @@ self: { libraryHaskellDepends = [ array base bytestring pureMD5 ]; description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ds-kanren" = callPackage From 14c10906dbadc239ae2ecfced6f1dcb9b602da11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 11:07:25 +0000 Subject: [PATCH 019/117] btrfs-progs: 6.1.3 -> 6.2.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 8c04f5d23387..e4bd7c26190f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.1.3"; + version = "6.2.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-03/J7E+ld4sgqnVI/nBus6MAM4wUczGCca5UAk2scWc="; + sha256 = "sha256-r1XjEEz15SJSu5QKKR7TSFKRYiSlAgZgDJQTRmQnMpk="; }; nativeBuildInputs = [ From 1c430957694840e5771297c5ef7506492dabd270 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 4 Mar 2023 14:00:26 +0100 Subject: [PATCH 020/117] haskell.packages.ghc94.primitive: Pin to 0.7.4.0 --- .../configuration-ghc-9.4.x.nix | 3 +-- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 27 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 8bfa2bf69a16..5bdd1686935a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -99,8 +99,7 @@ in { parallel = doJailbreak super.parallel; path = doJailbreak super.path; polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); - primitive = doDistribute self.primitive_0_8_0_0; - quickcheck-instances = doDistribute self.quickcheck-instances_0_3_29_1; + primitive = dontCheck (doJailbreak self.primitive_0_7_4_0); regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 315a33baa034..f98916e76ccd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -120,6 +120,7 @@ extra-packages: - ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3 - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* + - primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 793cfe7965a0..8962d7e99fc3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -230630,6 +230630,33 @@ 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"; + revision = "1"; + editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62"; + 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_0_8_0_0" = callPackage ({ mkDerivation, base, base-orphans, data-array-byte, deepseq , ghc-prim, QuickCheck, quickcheck-classes-base, tagged, tasty From 6a1da3b21ac581ffec660940d75107f3c979df15 Mon Sep 17 00:00:00 2001 From: SnIcK Date: Wed, 22 Feb 2023 12:11:29 -0600 Subject: [PATCH 021/117] python3Packages.openaiauth: init at 0.3.2 --- .../python-modules/openaiauth/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/openaiauth/default.nix diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix new file mode 100644 index 000000000000..bfe13d57dd9e --- /dev/null +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "openaiauth"; + version = "0.3.2"; + + src = fetchPypi { + inherit version; + pname = "OpenAIAuth"; + hash = "sha256-CPcBgGvxRO677EdPI3lNtJXkCW7el6N6N2GeaDo5ApU="; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + pythonImportsCheck = [ + "OpenAIAuth" + ]; + + meta = with lib; { + description = "A Python library for authenticating with the OpenAI API"; + license = licenses.mit; + maintainers = with maintainers; [ realsnick ]; + homepage = "https://github.com/acheong08/OpenAIAuth"; + changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bfbfb1504357..bfbfa2959b6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7086,6 +7086,8 @@ self: super: with self; { openai = callPackage ../development/python-modules/openai { }; + openaiauth = callPackage ../development/python-modules/openaiauth { }; + openapi-core = callPackage ../development/python-modules/openapi-core { }; overly = callPackage ../development/python-modules/overly { }; From 5edaf6903cee9c187d3ad191c440e38f5ba1406d Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sun, 5 Mar 2023 17:06:34 -0800 Subject: [PATCH 022/117] taskell: unbreak build taskell requires brick <= 1.0 --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb050cf6721a..9dc14bb68ac1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1783,7 +1783,11 @@ self: super: { # Too strict version bounds on a bunch of libraries: # https://github.com/smallhadroncollider/taskell/issues/100 # May be possible to remove at the next release (1.11.0) - taskell = doJailbreak super.taskell; + taskell = (doJailbreak super.taskell).override { + # Does not support brick >= 1.0 + # https://github.com/smallhadroncollider/taskell/issues/125 + brick = self.brick_0_70_1; + }; # Polyfill for GHCs from the integer-simple days that don't bundle ghc-bignum ghc-bignum = super.ghc-bignum or self.mkDerivation { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4ed05107d653..0d4311ad3600 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5209,7 +5209,6 @@ broken-packages: - tamarin-prover-utils - Tape - tapioca - - taskell - TaskMonad - tasty-auto - tasty-autocollect From c54e50710205e56d0a5ccd60ed68f84398b54b8e Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sun, 5 Mar 2023 17:08:38 -0800 Subject: [PATCH 023/117] taskell: remove doJailbreak taskell >= 1.11.0 no longer requires jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9dc14bb68ac1..7f6257f8162f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1780,10 +1780,7 @@ self: super: { # https://github.com/serokell/haskell-crypto/issues/25 crypto-sodium = dontCheck super.crypto-sodium; - # Too strict version bounds on a bunch of libraries: - # https://github.com/smallhadroncollider/taskell/issues/100 - # May be possible to remove at the next release (1.11.0) - taskell = (doJailbreak super.taskell).override { + taskell = super.taskell.override { # Does not support brick >= 1.0 # https://github.com/smallhadroncollider/taskell/issues/125 brick = self.brick_0_70_1; From 09f2c45f6ba57a85d98b0c02cababd6034fd401f Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sun, 5 Mar 2023 18:01:41 -0800 Subject: [PATCH 024/117] diagrams-gtk: unbreak build doJailbreak is required to allow base >= 4.16 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb050cf6721a..e5fbcb20f019 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2479,4 +2479,7 @@ self: super: { # bytestring <0.11.0, optparse-applicative <0.13.0 # https://github.com/kseo/sfnt2woff/issues/1 sfnt2woff = doJailbreak super.sfnt2woff; + + # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 + diagrams-gtk = doJailbreak super.diagrams-gtk; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4ed05107d653..5197ca47c501 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1129,7 +1129,6 @@ broken-packages: - dia-base - diagrams-boolean - diagrams-builder - - diagrams-gtk - diagrams-pdf - diagrams-qrcode - diagrams-rubiks-cube From 58244e97c2978648868f1d253c47192bcf4b0756 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 6 Mar 2023 14:08:42 +0900 Subject: [PATCH 025/117] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8962d7e99fc3..fb12f865096f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -81109,8 +81109,6 @@ self: { ]; description = "Backend for rendering diagrams directly to GTK windows"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-haddock" = callPackage @@ -282442,9 +282440,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; - broken = true; }) {}; "taskpool" = callPackage From f613d92a67fb0872bdb4f622e32183058f262778 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 026/117] smimesign: 0.1.0 -> 0.2.0 https://github.com/github/smimesign/releases/tag/v0.2.0 --- pkgs/os-specific/darwin/smimesign/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index d50e00f984e5..48164d387fa9 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "smimesign"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "github"; repo = "smimesign"; rev = "v${version}"; - sha256 = "12f8vprp4v78l9ifrlql0mvpyw5qa8nlrh5ajq5js8wljzpx7wsv"; + hash = "sha256-W9Hj/+snx+X6l95Gt9d8DiLnBPV9npKydc/zMN9G0vQ="; }; - vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; + vendorHash = "sha256-wLqYUICL+gdvRCLNrA0ZNcFI4oV3Oik762q7xF115Lw="; - ldflags = [ "-X main.versionString=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.versionString=v${version}" ]; + + # Fails in sandbox + doCheck = false; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; From 70ec07b998ba7bb60f2a2b5872d3b46c72fb052a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Mar 2023 20:07:34 +0100 Subject: [PATCH 027/117] haskell.packages.ghc94.aeson: allow quickcheck-instances 0.3.28 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 5bdd1686935a..e063268f9680 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -71,7 +71,8 @@ in { # Jailbreaks & Version Updates - aeson = doDistribute self.aeson_2_1_2_1; + # Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound) + aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); assoc = doJailbreak super.assoc; async = doJailbreak super.async; From b1e6e553faf3276ec478ae47878b0dab19504342 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Mar 2023 21:18:48 +0200 Subject: [PATCH 028/117] trivial-builders.writeShellApplication: use unwrapped shellcheck originally done in 62e1d58a6fbced03205afd00ec0e896d2ac26c45 but reverted in 6d8041b0532c8b51a93f68c9737feecbb195d32a because it contained many haskell deps --- pkgs/build-support/trivial-builders.nix | 6 ++++-- pkgs/top-level/stage.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index ce3dfc83e18e..d8b4ae5dd97f 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }: let inherit (lib) @@ -341,7 +341,9 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${lib.getExe shellcheck} "$target" + # use shellcheck which does not include docs + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" runHook postCheck '' else checkPhase; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 2b503bce7c04..b796b26307e7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -103,7 +103,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { inherit lib; - inherit (self) runtimeShell stdenv stdenvNoCC; + inherit (self) runtimeShell stdenv stdenvNoCC haskell; inherit (self.pkgsBuildHost) shellcheck; inherit (self.pkgsBuildHost.xorg) lndir; }; From b274a380cfec45850b369c31327c02ce36d694da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 04:25:48 +0000 Subject: [PATCH 029/117] logcheck: 1.3.23 -> 1.4.2 --- pkgs/tools/system/logcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index dea241e11acd..743265caf2ea 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.23"; + version = "1.4.2"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk="; + sha256 = "sha256-DGUd6zHcIB8VhOzqKSslmTK65uPozvhG2zEJ6Jp/IX4="; }; prePatch = '' From 28d86311edbdba8588a8e4d6737179faf85726f7 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 8 Mar 2023 11:47:39 +0100 Subject: [PATCH 030/117] herbstluftwm: fix tests with gcc12 The herbstluftwm test suite failed since cb5727323607dd9cc1fa12a8147ce21389df6599. We can avoid this by backporting an upstream fix. --- pkgs/applications/window-managers/herbstluftwm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index f1d7c585c443..7bfe0f992746 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell +, fetchpatch , nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,12 @@ stdenv.mkDerivation rec { patches = [ ./test-path-environment.patch + # Adjust tests for compatibility with gcc 12 (https://github.com/herbstluftwm/herbstluftwm/issues/1512) + # Can be removed with the next release (>0.9.5). + (fetchpatch { + url = "https://github.com/herbstluftwm/herbstluftwm/commit/8678168c7a3307b1271e94974e062799e745ab40.patch"; + hash = "sha256-uI6ErfDitT2Tw0txx4lMSBn/jjiiyL4Qw6AJa/CTh1E="; + }) ]; postPatch = '' From faa92cd30b1079e76b99716aa92df7cc5c552dd6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Feb 2023 16:19:18 +0100 Subject: [PATCH 031/117] pkgsCross.ghcjs.haskellPackages.ghc: formally disable shared libs Hadrian does this automatically unfortunately, but unless we correctly set enableShared as well, mkDerivation will try building shared libs which will inevitably fail due to missing shared core packages. Let's stay away from fully_static which does a lot of funky stuff and was not working before anyways for pkgsStatic. --- pkgs/development/compilers/ghc/common-hadrian.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5f0953b1bca3..0539efbd800b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -62,7 +62,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs , # Whether to build terminfo. enableTerminfo ? !(stdenv.targetPlatform.isWindows @@ -91,7 +91,7 @@ transformers = lib.optionals useLLVM [ "llvm" ] ++ lib.optionals (!enableShared) [ - "fully_static" + "no_dynamic_libs" "no_dynamic_ghc" ] ++ lib.optionals (!enableProfiledLibs) [ "no_profiled_libs" ] From 471b9cab41b218080f5e9f4abbc83eaaa60c6abf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Feb 2023 16:21:57 +0100 Subject: [PATCH 032/117] haskell.compiler.ghcHEAD: 9.7.20221224 -> 9.7.20230217 - Christmas is over! - Upstream has changed the name of the target triplet used for the JS backend from js-unknown-ghcjs to javascript-unknown-ghcjs, since Cabal calls the architecture "javascript": https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c Since the triplet is made up anyways, i.e. autoconf does not support it and Rust uses different triplets for its emscripten backends, we'll just change it as well. - Upstream fixed the problem with ar(1) being invoked incorrectly by stage0: https://gitlab.haskell.org/ghc/ghc/-/commit/e987e345c807035e4637ca3eae227ae501e16c42 --- lib/systems/doubles.nix | 2 +- lib/systems/examples.nix | 5 ++++- lib/systems/inspect.nix | 2 +- lib/systems/parse.nix | 2 +- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/top-level/release-haskell.nix | 3 --- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 383dd30bfdb2..6b19309d11ff 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -22,7 +22,7 @@ let "x86_64-solaris" # JS - "js-ghcjs" + "javascript-ghcjs" # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index de5adad3ca52..9ea2e3b56e92 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -329,6 +329,9 @@ rec { # Ghcjs ghcjs = { - config = "js-unknown-ghcjs"; + # This triple is special to GHC/Cabal/GHCJS and not recognized by autotools + # See: https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c + # https://github.com/ghcjs/ghcjs/issues/53 + config = "javascript-unknown-ghcjs"; }; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 30615c9fde32..b32c8630107b 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -49,7 +49,7 @@ rec { isM68k = { cpu = { family = "m68k"; }; }; isS390 = { cpu = { family = "s390"; }; }; isS390x = { cpu = { family = "s390"; bits = 64; }; }; - isJavaScript = { cpu = cpuTypes.js; }; + isJavaScript = { cpu = cpuTypes.javascript; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 5987cf1b5d24..bd3366e140bf 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -131,7 +131,7 @@ rec { or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; }; - js = { bits = 32; significantByte = littleEndian; family = "js"; }; + javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; }; }; # GNU build systems assume that older NetBSD architectures are using a.out. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3e63ddced611..02806676a360 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -115,6 +115,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Calling `makeSetupHook` without passing a `name` argument is deprecated. +- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name. + - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 19739ecbd14f..35d285ca2b2e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20221224"; - rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19"; - sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi"; + version = "9.7.20230217"; + rev = "a203ad854ffee802e6bf0aca26e6c9a99bec3865"; + sha256 = "06q6l7svdynvdv90yz6dxbsk3j5c8gh5ghwfl02rdwamcrzw7zic"; } diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index adc9b9fe0a73..2267860af220 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -351,9 +351,6 @@ let pkgsCross.ghcjs.haskellPackages = removePlatforms [ - # Still unexplained build failure: https://github.com/NixOS/nixpkgs/issues/217127 - "x86_64-darwin" - # Hydra output size of 3GB is exceeded "aarch64-linux" ] From 23dc76fd2248d51625f3375d506416415dfba7d6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Feb 2023 12:24:52 +0100 Subject: [PATCH 033/117] haskell.compiler.ghcHEAD: fix hadrianFlagsArray handling --- pkgs/development/compilers/ghc/common-hadrian.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 0539efbd800b..cead462b88d1 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -426,10 +426,10 @@ stdenv.mkDerivation ({ runHook preBuild # hadrianFlagsArray is created in preConfigure - echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray}" + echo "hadrianFlags: $hadrianFlags ''${hadrianFlagsArray[@]}" # We need to go via the bindist for installing - hadrian $hadrianFlags "''${hadrianFlagsArray}" binary-dist-dir + hadrian $hadrianFlags "''${hadrianFlagsArray[@]}" binary-dist-dir runHook postBuild ''; From 97d55ec923b0cd3798a6a84e2e0a6b2c6b54f6a9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 22 Feb 2023 13:56:03 +0100 Subject: [PATCH 034/117] haskell.compiler.ghcHEAD: drop malformed/redundant hadrian setting `*.*.rts.*.opts` is actually copied from the migration GHC blog post, but does not, actually, parse: The format is `....`, so it would need to be `*.rts.ghc.opts`. This is already achieved by the broader rule on the next line. --- pkgs/development/compilers/ghc/common-hadrian.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index cead462b88d1..a85ad54591e6 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -182,7 +182,6 @@ let # be needed for TemplateHaskell. This solution was described in # https://www.tweag.io/blog/2020-09-30-bazel-static-haskell lib.optionals enableRelocatedStaticLibs [ - "*.*.rts.*.opts += -fPIC -fexternal-dynamic-refs" "*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs" ] ++ lib.optionals targetPlatform.useAndroidPrebuilt [ From 0572ebb43558c8a43c8f209fbdc14d2a2ef0559a Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Wed, 8 Mar 2023 19:02:03 -0500 Subject: [PATCH 035/117] python3Packages.types-ujson: init at 5.7.0.1 --- .../python-modules/types-ujson/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/types-ujson/default.nix diff --git a/pkgs/development/python-modules/types-ujson/default.nix b/pkgs/development/python-modules/types-ujson/default.nix new file mode 100644 index 000000000000..5dda91299776 --- /dev/null +++ b/pkgs/development/python-modules/types-ujson/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-ujson"; + version = "5.7.0.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VDUaYuwbZVDvsXr2PvfwwA0O+pwJnefaXGJ+HvooBVM="; + }; + + doCheck = false; + + pythonImportsCheck = [ + "ujson-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for ujson"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2007572180c..fffa42ae4822 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11960,6 +11960,8 @@ self: super: with self; { types-typed-ast = callPackage ../development/python-modules/types-typed-ast { }; + types-ujson = callPackage ../development/python-modules/types-ujson { }; + types-urllib3 = callPackage ../development/python-modules/types-urllib3 { }; typesentry = callPackage ../development/python-modules/typesentry { }; From f8d30dda8fd6bf88d8acfb0a5fec06a66713303e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Mar 2023 04:20:00 +0000 Subject: [PATCH 036/117] buildkit: 0.11.2 -> 0.11.4 https://github.com/moby/buildkit/releases/tag/v0.11.3 https://github.com/moby/buildkit/releases/tag/v0.11.4 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 11c0d85ee474..b17e8d348d89 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY="; + hash = "sha256-/9gP8ciHeFKjO0VAKXDor19Wm6wULLVlFYbHUYWFpWY="; }; vendorHash = null; From 48f91f22ae9ba1d5e31571acb773386b622d3b16 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Mar 2023 04:20:00 +0000 Subject: [PATCH 037/117] pgsync: 0.7.3 -> 0.7.4 --- pkgs/development/tools/database/pgsync/Gemfile.lock | 10 +++++----- pkgs/development/tools/database/pgsync/gemset.nix | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 9c6927136097..e27726b69db7 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: https://rubygems.org/ specs: parallel (1.22.1) - pg (1.4.5) - pgsync (0.7.3) + pg (1.4.6) + pgsync (0.7.4) parallel pg (>= 0.18.2) - slop (>= 4.8.2) + slop (>= 4.10.1) tty-spinner - slop (4.10.0) + slop (4.10.1) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) @@ -20,4 +20,4 @@ DEPENDENCIES pgsync BUNDLED WITH - 2.3.7 + 2.4.6 diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index 3224efedfc12..a18ec0613f18 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.4.5"; + version = "1.4.6"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2"; + sha256 = "1f2lzsa7l88skp18f8w1ch9w8a42pymc48rdaqjrrdgg0126kvj3"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.4"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; + sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4"; type = "gem"; }; - version = "4.10.0"; + version = "4.10.1"; }; tty-cursor = { groups = ["default"]; From 0f506896ac1d2da64e6a7002078e51dc9f6890fd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 6 Mar 2023 15:05:35 -0500 Subject: [PATCH 038/117] python310Packages.evaluate: fix `evaluate-cli` and add as mainProgram --- pkgs/development/python-modules/evaluate/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 1ada1243bf72..6412e7834a62 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pythonRelaxDepsHook , pytestCheckHook +, cookiecutter , datasets , dill , fsspec @@ -13,6 +14,7 @@ , numpy , packaging , pandas +, pyarrow , requests , responses , tqdm @@ -37,6 +39,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "responses" ]; propagatedBuildInputs = [ + cookiecutter datasets numpy dill @@ -48,6 +51,7 @@ buildPythonPackage rec { fsspec huggingface-hub packaging + pyarrow responses ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata @@ -66,5 +70,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/evaluate/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "evaluate-cli"; }; } From 5333953d98fd81d9874e5a27b7198fc7216fe9b5 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Fri, 10 Mar 2023 09:23:13 +0100 Subject: [PATCH 039/117] qutebrowser: 2.5.2 -> 2.5.3 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b20cb19bf12e..0c3bf4cd5cdc 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -38,7 +38,7 @@ buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication; pname = "qutebrowser"; - version = if isQt6 then "unstable-2022-09-16" else "2.5.2"; + version = if isQt6 then "unstable-2022-09-16" else "2.5.3"; in @@ -60,7 +60,7 @@ buildPythonApplication { # the release tarballs are different from the git checkout! else fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; + hash = "sha256-hF7yJDTQIztUcZJae20HVhfGlLprvz6GWrgpSwLJ14E="; }; # Needs tox From 100d887968afd0f6ee555072da645ce3f66cfb6b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 10 Mar 2023 14:43:00 +0100 Subject: [PATCH 040/117] release-haskell.nix: add aarch64-darwin nixpkgs:trunk also builds aarch64-darwin these days, so this forces our hand a little bit. We can still refuse to care about failures _too_ much, but at least we will stop merging as big a rebuilds as we are currently. --- maintainers/scripts/haskell/hydra-report.hs | 4 +++- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 27b3d3c43a8a..2cbeedeaf7a5 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -328,6 +328,7 @@ platformIcon (Platform x) = case x of "x86_64-linux" -> ":penguin:" "aarch64-linux" -> ":iphone:" "x86_64-darwin" -> ":apple:" + "aarch64-darwin" -> ":green_apple:" _ -> x data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) @@ -488,7 +489,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = if' (isNothing maintainedJob) "No `maintained` job found." <> if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> + if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." if' p e = if p then [e] else mempty outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m maintainedJob = Map.lookup "maintained" summary diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2267860af220..c9be9cc46006 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -9,7 +9,7 @@ $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix */ -{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: +{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] }: let From b484149fa13886f937b6b023de3977f3d77ed45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 10 Mar 2023 16:03:35 -0600 Subject: [PATCH 041/117] =?UTF-8?q?jetbrains.jdk:=2017.0.5-b653.25=20?= =?UTF-8?q?=E2=86=92=2017.0.6-b829.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/jetbrains-jdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 143feeb98e16..883b19bb4ed0 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -29,8 +29,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; - javaVersion = "17.0.5"; - build = "653.25"; + javaVersion = "17.0.6"; + build = "829.5"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; + hash = "sha256-LTwmuoKKwkuel0a1qcYNnb0d3HBFoABvmqCcrsPyh2I="; }; BOOT_JDK = openjdk17-bootstrap.home; From 15a8d05ba592355f37442743bb3ce9fe55b72911 Mon Sep 17 00:00:00 2001 From: hsjobeki Date: Tue, 28 Feb 2023 11:04:19 +0100 Subject: [PATCH 042/117] init: lib.foldlAttrs - provide comprehensive example - add unit test --- lib/attrsets.nix | 60 ++++++++++++++++++++++++++++++++++++++++++++++ lib/default.nix | 2 +- lib/tests/misc.nix | 31 ++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 30952651adf4..d9a6eab0603e 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -333,6 +333,66 @@ rec { ) (attrNames set) ); + /* + Like builtins.foldl' but for attribute sets. + Iterates over every name-value pair in the given attribute set. + The result of the callback function is often called `acc` for accumulator. It is passed between callbacks from left to right and the final `acc` is the return value of `foldlAttrs`. + + Attention: + There is a completely different function + `lib.foldAttrs` + which has nothing to do with this function, despite the similar name. + + Example: + foldlAttrs + (acc: name: value: { + sum = acc.sum + value; + names = acc.names ++ [name]; + }) + { sum = 0; names = []; } + { + foo = 1; + bar = 10; + } + -> + { + sum = 11; + names = ["bar" "foo"]; + } + + foldlAttrs + (throw "function not needed") + 123 + {}; + -> + 123 + + foldlAttrs + (_: _: v: v) + (throw "initial accumulator not needed") + { z = 3; a = 2; }; + -> + 3 + + The accumulator doesn't have to be an attrset. + It can be as simple as a number or string. + + foldlAttrs + (acc: _: v: acc * 10 + v) + 1 + { z = 1; a = 2; }; + -> + 121 + + Type: + foldlAttrs :: ( a -> String -> b -> a ) -> a -> { ... :: b } -> a + */ + foldlAttrs = f: init: set: + foldl' + (acc: name: f acc name set.${name}) + init + (attrNames set); + /* Apply fold functions to values grouped by key. Example: diff --git a/lib/default.nix b/lib/default.nix index 85303e0a5abf..0424db36b2e9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -78,7 +78,7 @@ let composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs - filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs + filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 07d04f5356c7..baa382f3e589 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -533,6 +533,37 @@ runTests { }; }; + # code from example + testFoldlAttrs = { + expr = { + example = foldlAttrs + (acc: name: value: { + sum = acc.sum + value; + names = acc.names ++ [ name ]; + }) + { sum = 0; names = [ ]; } + { + foo = 1; + bar = 10; + }; + # should just return the initial value + emptySet = foldlAttrs (throw "function not needed") 123 { }; + # should just evaluate to the last value + accNotNeeded = foldlAttrs (_acc: _name: v: v) (throw "accumulator not needed") { z = 3; a = 2; }; + # the accumulator doesnt have to be an attrset it can be as trivial as being just a number or string + trivialAcc = foldlAttrs (acc: _name: v: acc * 10 + v) 1 { z = 1; a = 2; }; + }; + expected = { + example = { + sum = 11; + names = [ "bar" "foo" ]; + }; + emptySet = 123; + accNotNeeded = 3; + trivialAcc = 121; + }; + }; + # code from the example testRecursiveUpdateUntil = { expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { From c45b60f545d6da2d8b4678c7977b47d3c7e4faa9 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sat, 11 Mar 2023 11:27:04 +0100 Subject: [PATCH 043/117] maintainers: add Tungsten842 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34d7aa4c4f93..bb1fd1558b8e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15011,6 +15011,12 @@ fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; }]; }; + Tungsten842 = { + name = "Tungsten842"; + email = "886724vf@anonaddy.me"; + github = "Tungsten842"; + githubId = 24614168; + }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; From 1625749514034bb8dae07ffe81a3611b92e85fa1 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sat, 11 Mar 2023 11:46:54 +0100 Subject: [PATCH 044/117] evhz: init at unstable-2021-09-20 --- pkgs/tools/misc/evhz/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/evhz/default.nix diff --git a/pkgs/tools/misc/evhz/default.nix b/pkgs/tools/misc/evhz/default.nix new file mode 100644 index 000000000000..703dcae083a3 --- /dev/null +++ b/pkgs/tools/misc/evhz/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromSourcehut +}: + +stdenv.mkDerivation { + pname = "evhz"; + version = "unstable-2021-09-20"; + + src = fetchFromSourcehut { + owner = "~iank"; + repo = "evhz"; + rev = "35b7526e0655522bbdf92f6384f4e9dff74f38a0"; + hash = "sha256-lC0CeN9YVhkSiooC59Dbom811jHvPDQcYl+KADUwVdQ="; + }; + + buildPhase = "gcc -o evhz evhz.c"; + + installPhase = '' + mkdir -p $out/bin + mv evhz $out/bin + ''; + + meta = with lib; { + description = "Show mouse refresh rate under linux + evdev"; + homepage = "https://git.sr.ht/~iank/evhz"; + license = licenses.gpl3; + maintainers = with maintainers; [ Tungsten842 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca2740c734fb..ab77e8419272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -518,6 +518,8 @@ with pkgs; evans = callPackage ../development/tools/evans { }; + evhz = callPackage ../tools/misc/evhz { }; + expressvpn = callPackage ../applications/networking/expressvpn { }; figma-linux = callPackage ../applications/graphics/figma-linux {}; From cb0472b23241b10a719fe5dbe94124ce0f26603e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Mar 2023 10:52:29 +0000 Subject: [PATCH 045/117] lima-bin: 0.14.2 -> 0.15.0 --- pkgs/applications/virtualization/lima/bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 86b49c5a1eb6..3b6711a1f74c 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.14.2"; + version = "0.15.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894"; + sha256 = "0da51d3c179e89bde404ea40be88b5c11aea8c7cf50cd030fd5b779e91462856"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0"; + sha256 = "c535bc21923bc290ac56fe3a9ea87e8740c7c51e030f05cc32d51e726a59673e"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230"; + sha256 = "964c897f6dc2a6e203b0c109a7cd59102fe192837c792549b597d7ac301ecf54"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143"; + sha256 = "5ec308716abe8833ce36d6e77cac44d98d7cfc8add8dbcbe053a91af01cecfa1"; }; }; in From 26bd3c74acdc2e678442b1dbc7b922de0fc81f45 Mon Sep 17 00:00:00 2001 From: Anatolii Popov Date: Thu, 15 Dec 2022 17:09:16 +0200 Subject: [PATCH 046/117] jetbrains-toolbox: init at 1.27.3.14493 --- .../misc/jetbrains-toolbox/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/misc/jetbrains-toolbox/default.nix diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix new file mode 100644 index 000000000000..b7354278c20f --- /dev/null +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchzip +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, runCommand +, appimageTools +, patchelf +}: +let + pname = "jetbrains-toolbox"; + version = "1.27.3.14493"; + + src = fetchzip { + url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; + sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY="; + stripRoot = false; + }; + + appimageContents = runCommand "${pname}-extracted" + { + nativeBuildInputs = [ appimageTools.appimage-exec ]; + } + '' + appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + ''; + + appimage = appimageTools.wrapAppImage { + inherit pname version; + src = appimageContents; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); + }; + + desktopItem = makeDesktopItem { + name = "JetBrains Toolbox"; + exec = "jetbrains-toolbox"; + comment = "JetBrains Toolbox"; + desktopName = "JetBrains Toolbox"; + type = "Application"; + icon = "jetbrains-toolbox"; + terminal = false; + categories = [ "Development" ]; + startupWMClass = "jetbrains-toolbox"; + startupNotify = false; + }; +in +stdenv.mkDerivation { + inherit pname version src appimage; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg + makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} --append-flags "--update-failed" + + runHook postInstall + ''; + + desktopItems = [ desktopItem ]; + + # Disabling the tests, this seems to be very difficult to test this app. + doCheck = false; + + meta = with lib; { + description = "Jetbrains Toolbox"; + homepage = "https://jetbrains.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ AnatolyPopov ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4d7a4ff91b..ec3e73c6336a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17081,6 +17081,8 @@ with pkgs; infracost = callPackage ../tools/misc/infracost { }; + jetbrains-toolbox = callPackage ../applications/misc/jetbrains-toolbox { }; + msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; From 497894e9ec454b20b1bdb65118dda637bfdb4267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Mar 2023 08:03:22 -0800 Subject: [PATCH 047/117] imagemagick: 7.1.1-0 -> 7.1.1-2 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-0...7.1.1-2 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d45ae2fa5493..387cb97a3cbc 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-0"; + version = "7.1.1-2"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA="; + hash = "sha256-5B8grg05n+MkHZU76QBsrrU5Z3VZRGMRHX35HXtTbe8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 7ba82dc81e5e1973a9efea4c6534436ce2ee2ce1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Mar 2023 19:23:13 +0200 Subject: [PATCH 048/117] marst,libidn2,mdk: remove duplicate /gnu in the url there urls only worked with "https://ftpmirror.gnu.org/" because it ignored the extra /gnu while with the other gnu mirrors "https://ftp.nluug.nl/pub/gnu/" it failed because the url would be pub/gnu/gnu. --- pkgs/development/compilers/marst/default.nix | 2 +- pkgs/development/libraries/libidn2/default.nix | 2 +- pkgs/development/tools/mdk/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/marst/default.nix b/pkgs/development/compilers/marst/default.nix index 8412c149c234..8644fcf7bf43 100644 --- a/pkgs/development/compilers/marst/default.nix +++ b/pkgs/development/compilers/marst/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.7"; src = fetchurl { - url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA="; }; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 9d7babd01dd2..d76f30488151 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.3.2"; src = fetchurl { - url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz"; + url = "mirror://gnu/libidn/${pname}-${version}.tar.gz"; sha256 = "sha256-dpQM1Od46Ak1eanRlbJf/16Tbp3GJCBoUotDenZ2T5E="; }; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 30ae23e85a8d..7345540b51b2 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gnu-mdk"; version = "1.3.0"; src = fetchurl { - url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz"; + url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkg-config intltool ]; From 2463b8d0506f6a31f890629b04b8e9c843d3ec41 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 12 Mar 2023 09:40:24 +0800 Subject: [PATCH 049/117] python3Packages.dbus-python-client-gen: 0.8 -> 0.8.2 Diff: https://github.com/stratis-storage/dbus-python-client-gen/compare/v0.8...v0.8.2 --- .../python-modules/dbus-python-client-gen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index ee4a467b5779..c01613864b32 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "dbus-python-client-gen"; - version = "0.8"; + version = "0.8.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-nSzxT65WHBVct5pGHmIAHJXftd0tKZeK/argN+V9xcs="; + hash = "sha256-RYgS4RNLLCtp+5gS/LlzdH7rlub48TSSSKhykkkBcuo="; }; propagatedBuildInputs = [ From f07d4d077e2cc133c1d33edf668c9533789f2b0a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 15 Jan 2023 21:23:21 +0100 Subject: [PATCH 050/117] haskell.compiler.ghc961: init at 9.6.1 xhtml seems to be built unconditionally now which is at least one thing improved by hadrian. --- pkgs/development/compilers/ghc/9.6.1.nix | 4 ++ .../compilers/ghc/common-hadrian.nix | 4 +- .../configuration-ghc-9.6.x.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 33 +++++++++++- pkgs/top-level/release-haskell.nix | 21 +++++--- 6 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/compilers/ghc/9.6.1.nix create mode 100644 pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix diff --git a/pkgs/development/compilers/ghc/9.6.1.nix b/pkgs/development/compilers/ghc/9.6.1.nix new file mode 100644 index 000000000000..7e8622f218cb --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.1.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.6.1"; + sha256 = "fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index a85ad54591e6..d359f3fd521d 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -395,9 +395,11 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + # autoconf and friends are necessary for hadrian to create the bindist + autoconf automake m4 ] ++ lib.optionals (rev != null) [ # We need to execute the boot script - autoconf automake m4 python3 + python3 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix new file mode 100644 index 000000000000..7ac21dd5f3f1 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -0,0 +1,50 @@ +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +with haskellLib; + +self: super: { + llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + + # Disable GHC core libraries + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + Cabal-syntax = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + # terminfo is not built if GHC is a cross compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9103cf91a26..0813e570f4c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15002,7 +15002,7 @@ with pkgs; haskellPackages = dontRecurseIntoAttrs # JS backend is only available for GHC >= 9.6 (if stdenv.hostPlatform.isGhcjs - then haskell.packages.native-bignum.ghcHEAD + then haskell.packages.native-bignum.ghc96 # Prefer native-bignum to avoid linking issues with gmp else if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc92 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8c51eb406e6b..7eda3c5ddca2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -25,6 +25,8 @@ let "ghc943" "ghc944" "ghc94" + "ghc96" + "ghc961" "ghcHEAD" ]; @@ -40,6 +42,8 @@ let "ghc942" "ghc943" "ghc944" + "ghc96" + "ghc961" "ghcHEAD" ]; @@ -299,6 +303,27 @@ in { llvmPackages = pkgs.llvmPackages_12; }; ghc94 = ghc944; + ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc924 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc924 + else if stdenv.isAarch64 then + packages.ghc924BinaryMinimal + else + packages.ghc924Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 15 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; + llvmPackages = pkgs.llvmPackages_14; + }; + ghc96 = ghc961; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -315,7 +340,7 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2022-08-04: Support range >= 10 && < 15 + # 2023-01-15: Support range >= 10 && < 15 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; llvmPackages = pkgs.llvmPackages_14; }; @@ -451,6 +476,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; ghc94 = ghc942; + ghc961 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc961; + ghc = bh.compiler.ghc961; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = ghc961; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c9be9cc46006..ef4b2ef71bc3 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -346,19 +346,26 @@ let }; }; - # TODO(@sternenseemann): when GHC 9.6 comes out we need separate jobs for - # default GHC and ghcHEAD. - pkgsCross.ghcjs.haskellPackages = + pkgsCross.ghcjs = removePlatforms [ # Hydra output size of 3GB is exceeded "aarch64-linux" ] { - inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) - ghc - hello - ; + haskellPackages = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) + ghc + hello + ; + }; + + haskell.packages.ghcHEAD = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) + ghc + hello + ; + }; }; }) (versionedCompilerJobs { From 7b7a444fc15c9367806b5dbf3128badf6a4a870f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 12 Mar 2023 13:19:16 +0100 Subject: [PATCH 051/117] Revert "haskellPackages.regex-rure: mark broken on aarch64-darwin" This reverts commit 41c538f80f3a98d6e40e7ea5e79f33429850a43e. Reason for revert: hydraPlatforms needs to be modified (e.g. via dontDistribute) on the evaluator's platform or it'll have no effect. Thus the markBroken here currently breaks the maintained aggregate job. --- pkgs/development/haskell-modules/configuration-darwin.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 1dbb3172b02e..c54e2dd03d30 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -318,11 +318,6 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; - # regex-rure's test suite fails with a dylib not loaded error due to some - # rpath issue. - regex-rure = dontDistribute (markBroken super.regex-rure); - jacinda = dontDistribute super.jacinda; - } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: From a738911124aac19232b0839342f970e97da0b7da Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 12 Mar 2023 13:21:22 +0100 Subject: [PATCH 052/117] release-haskell.nix: disable musl dependent jobs on aarch64-darwin --- pkgs/top-level/release-haskell.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ef4b2ef71bc3..8bd38359f911 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -303,6 +303,7 @@ let # musl only supports linux, not darwin. "x86_64-darwin" + "aarch64-darwin" ] { inherit (packagePlatforms pkgs.pkgsMusl.haskellPackages) @@ -319,7 +320,10 @@ let removePlatforms [ "aarch64-linux" # times out on Hydra - "x86_64-darwin" # TODO: reenable when static libiconv works on darwin + + # Static doesn't work on darwin + "x86_64-darwin" + "aarch64-darwin" ] { haskellPackages = { inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages) From a8e0c501e154b8c2036844c7d1e72cf93eac2657 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 12 Mar 2023 12:56:50 +0000 Subject: [PATCH 053/117] factorio: 1.1.74 -> 1.1.76 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 2dceedf776ba..51fa5b0c5c6a 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.76" }, "stable": { - "name": "factorio_alpha_x64-1.1.74.tar.xz", + "name": "factorio_alpha_x64-1.1.76.tar.xz", "needsAuth": true, - "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs", + "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/alpha/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", + "version": "1.1.76" } }, "demo": { From fad4960c41cc1472414fcad9cc7b3de75eb84143 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 12 Mar 2023 12:57:15 +0000 Subject: [PATCH 054/117] factorio-experimental: 1.1.76 -> 1.1.77 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 51fa5b0c5c6a..9d0cb98938d6 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.76.tar.xz", + "name": "factorio_alpha_x64-1.1.77.tar.xz", "needsAuth": true, - "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", + "sha256": "1qcjp51sykq0ygq4j4zih3yp1x517b2j54xfyi8g4minfk57zwk9", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.77/alpha/linux64", + "version": "1.1.77" }, "stable": { "name": "factorio_alpha_x64-1.1.76.tar.xz", From 1b8cb1247180e8de8d191182353fae223d79c211 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 12 Mar 2023 12:58:07 +0000 Subject: [PATCH 055/117] factorio-demo: 1.1.69 -> 1.1.76 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 9d0cb98938d6..1032f27af0cd 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -28,12 +28,12 @@ "version": "1.1.76" }, "stable": { - "name": "factorio_demo_x64-1.1.69.tar.xz", + "name": "factorio_demo_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29", + "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/demo/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.76/demo/linux64", + "version": "1.1.76" } }, "headless": { From fdd814ce0d5e9af04e1de94e19942216aee9aea2 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 12 Mar 2023 12:58:35 +0000 Subject: [PATCH 056/117] factorio-headless-experimental: 1.1.76 -> 1.1.77 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1032f27af0cd..6fd8a13e5c51 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.76.tar.xz", + "name": "factorio_headless_x64-1.1.77.tar.xz", "needsAuth": false, - "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", + "sha256": "1ygzlr26bp7l9znbjyqj7il6yq9faxjfr6cvfqbs8ls66qiv0ls6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/headless/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.77/headless/linux64", + "version": "1.1.77" }, "stable": { "name": "factorio_headless_x64-1.1.74.tar.xz", From fcd190ad2ade277aa1e5276beadd61210bcd2441 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 12 Mar 2023 12:58:52 +0000 Subject: [PATCH 057/117] factorio-headless: 1.1.74 -> 1.1.76 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 6fd8a13e5c51..1662e6a198a9 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -46,12 +46,12 @@ "version": "1.1.77" }, "stable": { - "name": "factorio_headless_x64-1.1.74.tar.xz", + "name": "factorio_headless_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv", + "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/headless/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/headless/linux64", + "version": "1.1.76" } } } From 67094042c33b0859d34c3caa30c489247ef8cdce Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 12 Mar 2023 14:13:27 -0400 Subject: [PATCH 058/117] ripdrag: 0.2.1 -> 0.3.0 --- pkgs/tools/misc/ripdrag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index d9eca0f1b649..dea4349c140c 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.2.1"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/TF9dWZQVEVM3lHp4ubxYkDW+ZDL9puT6mUT6Q3hUsw="; + sha256 = "sha256-D4WB1RdMPJfSLbJ96h3OuFhokfyY8Gamctm0XY694YM="; }; - cargoSha256 = "sha256-mIsT93XRU0mR5s5w3Sng2DTW2LyO9HT1w/1932vptIE="; + cargoSha256 = "sha256-C2I26E/dd18A4DDgOYGR8aS1RBrrNUwaXI4ZJHcrKy0="; nativeBuildInputs = [ pkg-config ]; From 2627f7d4467c3eb74da3dfb156dc5504d47eec48 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 12 Mar 2023 14:04:18 -0400 Subject: [PATCH 059/117] teip: 2.0.0 -> 2.3.0 Diff: https://github.com/greymd/teip/compare/v2.0.0...v2.3.0 Changelog: https://github.com/greymd/teip/releases/tag/v2.3.0 --- pkgs/tools/text/teip/default.nix | 36 +++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/tools/text/teip/default.nix index 14e1914dea8f..c0ac20a28149 100644 --- a/pkgs/tools/text/teip/default.nix +++ b/pkgs/tools/text/teip/default.nix @@ -1,28 +1,50 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles, perl }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, perl +, stdenv +}: rustPlatform.buildRustPackage rec { pname = "teip"; - version = "2.0.0"; + version = "2.3.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM="; + src = fetchFromGitHub { + owner = "greymd"; + repo = "teip"; + rev = "v${version}"; + hash = "sha256-09IKAM1ha40CvF5hdQIlUab7EBBFourC70LAagrs5+4="; }; - cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk="; + cargoHash = "sha256-cBFczgvLja6upuPnXphG2d9Rf1ZpNAVh16NHAHfXxHg="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ perl ]; + # Cargo.lock is outdated + preConfigure = '' + cargo update --offline + ''; + + # tests are locale sensitive + preCheck = '' + export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + ''; + postInstall = '' installManPage man/teip.1 - installShellCompletion --zsh completion/zsh/_teip + installShellCompletion \ + --bash completion/bash/teip \ + --fish completion/fish/teip.fish \ + --zsh completion/zsh/_teip ''; meta = with lib; { description = "A tool to bypass a partial range of standard input to any command"; homepage = "https://github.com/greymd/teip"; + changelog = "https://github.com/greymd/teip/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From f4af3b77fd86f33239fe5770f9eaba3ecef0de11 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 12 Mar 2023 18:18:31 -0400 Subject: [PATCH 060/117] megasync: 4.6.7.0 -> 4.9.0.0 --- pkgs/applications/misc/megasync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 7f51f7d102eb..79800a6c46ee 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.6.7.0"; + version = "4.9.0.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-vJSXvSTYEhxuG3KUQ+lBcppC8M70UnYlBLPHhYJSNOE="; + sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM="; fetchSubmodules = true; }; From f1e5019e5c14446319c95e175c3b4e8dd939f4a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 23:44:25 +0100 Subject: [PATCH 061/117] python310Packages.dash: add changelog to meta --- pkgs/development/python-modules/dash/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 5140a0a6cbc6..9427bdc03487 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -74,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; + changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ antoinerg ]; }; From 9d8ee314f705a035d40266bf9548eb4022bb68aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 23:50:38 +0100 Subject: [PATCH 062/117] python310Packages.dash: 2.7.0 -> 2.8.1 Diff: https://github.com/plotly/dash/compare/refs/tags/v2.7.0...v2.8.1 Changelog: https://github.com/plotly/dash/blob/v2.8.1/CHANGELOG.md --- .../python-modules/dash/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 9427bdc03487..4968c5b28f8b 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.7.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,16 +30,16 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY="; + hash = "sha256-6FsLvLsqnkSt/i27q/JJGfNh2zxKeA0t6VYNPCzhR0w="; }; propagatedBuildInputs = [ - plotly - flask - flask-compress dash-core-components dash-html-components dash-table + flask + flask-compress + plotly ]; passthru.optional-dependencies = { @@ -55,9 +55,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytestCheckHook - pytest-mock mock + pytest-mock + pytestCheckHook pyyaml ]; @@ -67,6 +67,11 @@ buildPythonPackage rec { "tests/integration" ]; + disabledTests = [ + # Failed: DID NOT RAISE + "test_missing_flask_compress_raises" + ]; + pythonImportsCheck = [ "dash" ]; From 0ede18818c429c6a711d75bffc0d87d565b43f9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Mar 2023 23:35:54 +0000 Subject: [PATCH 063/117] kubedog: 0.9.6 -> 0.9.9 --- pkgs/applications/networking/cluster/kubedog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index 9c1b14e6dd20..d3c60e7e6c7e 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubedog"; - version = "0.9.6"; + version = "0.9.9"; src = fetchFromGitHub { owner = "werf"; repo = "kubedog"; rev = "v${version}"; - hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + hash = "sha256-j7LR6+c2ZZJCqmHihXodtiF5bJhNR8eizDEqwm9IUn0="; }; - vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + vendorHash = "sha256-UPfB3nOzJpqh14xLKZP2mLfg7C55nQivrkmh3B7aKzo="; subPackages = [ "cmd/kubedog" ]; From b2c570ec43e71ca3ece75db07ca724784929ae0e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 01:29:33 +0100 Subject: [PATCH 064/117] haskell.compiler: always include python when building with hadrian We previously thought that we only need python if we were going to run ./boot or using emscripten which implements all its wrappers in python (and likes to reinvoke them). As it turns out, though, hadrian likes to invoke python itself for generating certain headers of rts using a script shipped with the GHC source. This fact was obscured before, since (presumably) sphinx would propagate python into PATH. --- pkgs/development/compilers/ghc/common-hadrian.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index d359f3fd521d..77e99ddf0da3 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -397,16 +397,12 @@ stdenv.mkDerivation ({ perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour # autoconf and friends are necessary for hadrian to create the bindist autoconf automake m4 - ] ++ lib.optionals (rev != null) [ - # We need to execute the boot script + # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. python3 ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals targetPlatform.isGhcjs [ - # emscripten itself is added via depBuildTarget / targetCC - python3 ]; # For building runtime libs From eb4034bd00cd9d7612cd6d0a3ffd2ef08c09df97 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 12 Mar 2023 22:42:45 -0400 Subject: [PATCH 065/117] unzrip: init at unstable-2023-03-13 --- pkgs/tools/compression/unzrip/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/compression/unzrip/default.nix diff --git a/pkgs/tools/compression/unzrip/default.nix b/pkgs/tools/compression/unzrip/default.nix new file mode 100644 index 000000000000..e3acb987b5c5 --- /dev/null +++ b/pkgs/tools/compression/unzrip/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, zstd +}: + +rustPlatform.buildRustPackage rec { + pname = "unzrip"; + version = "unstable-2023-03-13"; + + src = fetchFromGitHub { + owner = "quininer"; + repo = "unzrip"; + rev = "bd2dffd43c3235857500190571602f3ce58c5f70"; + hash = "sha256-Ih47xF4JYQf10RuTnfJJGUAJwyxDxCAdTTCdwGf4i/U="; + }; + + cargoHash = "sha256-11UESSKvTcr6Wa0cASRSQ55kBbRL5AelI6thv3oi0sI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zstd + ]; + + meta = with lib; { + description = "Unzip implementation, support for parallel decompression, automatic detection encoding"; + homepage = "https://github.com/quininer/unzrip"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c55163552a8..b13fd470dbdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13074,6 +13074,8 @@ with pkgs; untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + unzrip = callPackage ../tools/compression/unzrip { }; + up = callPackage ../tools/misc/up { }; upbound = callPackage ../development/tools/upbound { }; From 2531f77003f011c97c3ba6011ba452693ec26668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Mar 2023 04:40:45 +0000 Subject: [PATCH 066/117] python310Packages.qualysclient: 0.0.4.8.2 -> 0.0.4.8.3 --- pkgs/development/python-modules/qualysclient/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix index a61314816902..c1f570f75ae3 100644 --- a/pkgs/development/python-modules/qualysclient/default.nix +++ b/pkgs/development/python-modules/qualysclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qualysclient"; - version = "0.0.4.8.2"; + version = "0.0.4.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "woodtechie1428"; repo = pname; - rev = "v${version}"; - sha256 = "0hrbp5ci1l06j709k5y3z3ad9dryvrkvmc2wyb4a01gw7qzry7ys"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0="; }; propagatedBuildInputs = [ From 5c403aa4dada3ce83280747f918bcc62d892438a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Mar 2023 06:43:44 +0000 Subject: [PATCH 067/117] python310Packages.google-cloud-datastore: 2.14.0 -> 2.15.0 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index ad4931e56086..a6441e16b971 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-00SlS6iL65Z2N6tgNEaIcQ09WB8Jy8emOwlaZoKjNgA="; + hash = "sha256-HbIUo7JpYajnaESs7sZPuEpqyGiaYeB8ooYXgH/kqoE="; }; propagatedBuildInputs = [ From fed70c1eaa7982733dc59b105e556d0361d0dc5c Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 10 Mar 2023 20:16:07 +0100 Subject: [PATCH 068/117] vdirsyncer: 0.19.0->0.19.1 --- .../python-modules/vdirsyncer/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 418850444c7f..143a7576a49d 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -24,21 +24,21 @@ buildPythonPackage rec { pname = "vdirsyncer"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf"; + hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64="; }; postPatch = '' substituteInPlace setup.py \ --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0" - sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg + sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml ''; propagatedBuildInputs = [ @@ -53,10 +53,6 @@ buildPythonPackage rec { aiohttp-oauthlib ]; - nativeBuildInputs = [ - setuptools-scm - ]; - nativeCheckInputs = [ hypothesis pytestCheckHook From 16a5e2dd58f8d078023013314b23b25c4afb566f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 13 Mar 2023 07:51:45 +0100 Subject: [PATCH 069/117] vdirsyncer: remove unneeded substituteInPlace Upstream fixed the issue. --- pkgs/development/python-modules/vdirsyncer/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 143a7576a49d..034998fc904b 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -35,9 +35,6 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py \ - --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0" - sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml ''; From 83110d832227e661901db5edf269bd6636b4b3bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:35:46 +0100 Subject: [PATCH 070/117] python310Packages.qualysclient: add changelog to meta --- pkgs/development/python-modules/qualysclient/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qualysclient/default.nix b/pkgs/development/python-modules/qualysclient/default.nix index c1f570f75ae3..d53c9e80a6c6 100644 --- a/pkgs/development/python-modules/qualysclient/default.nix +++ b/pkgs/development/python-modules/qualysclient/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "woodtechie1428"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0="; + hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for interacting with the Qualys API"; homepage = "https://qualysclient.readthedocs.io/"; + changelog = "https://github.com/woodtechie1428/qualysclient/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 94ab5734a894139eeb829e4428d6c849772f7929 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:41:44 +0100 Subject: [PATCH 071/117] python310Packages.aiopvpc: 4.0.1 -> 4.1.0 Changelog: https://github.com/azogue/aiopvpc/blob/v4.1.0/CHANGELOG.md --- pkgs/development/python-modules/aiopvpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 0f44a49a3979..14f3a83481d5 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.0.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-E5z74/5VuFuOyAfeT4PQlHUNOiVT4sPgOdxoAIIymxU="; + hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4="; }; postPatch = '' From 739b09ae6b64932b6eb6aa576272ee5ed45e4424 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:45:18 +0100 Subject: [PATCH 072/117] python310Packages.google-cloud-access-context-manager: 0.1.15 -> 0.1.16 Changelog: https://github.com/googleapis/python-access-context-manager/blob/v0.1.16/CHANGELOG.md --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index b105e9cfe16d..d96874aeebd2 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.15"; + version = "0.1.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W6Nb+H2CaULQ7Hp1hYxtnF9ITYa++Usc7XVoPkQPnVk="; + hash = "sha256-+L5Rre6LHpSlc+yzdQpMLSvURLHd412apDes5zwzdgc="; }; propagatedBuildInputs = [ From c18ddc6e5e4c49d02a711f703c15bb145073764b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:46:00 +0100 Subject: [PATCH 073/117] python310Packages.google-cloud-iam: 2.10.0 -> 2.11.2 Changelog: https://github.com/googleapis/python-iam/releases/tag/v2.11.2 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index b06a5d3499be..aff4744fb01b 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.10.0"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8q/Am7x5LFN9Uaw37QdUdwL19J1FgxRKjRL0Vrc+1TI="; + hash = "sha256-viN/BiIYmE83B1JMh5THgj2/HLGOeIotDVLdTODZBAg="; }; propagatedBuildInputs = [ From 049a3b00b4aa71c6f87ce43dba51c600f92b8c02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:46:54 +0100 Subject: [PATCH 074/117] python310Packages.google-cloud-trace: 1.10.0 -> 1.11.0 Changelog: https://github.com/googleapis/python-trace/blob/v1.11.0/CHANGELOG.md --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index a753acdcc1e8..f21dd08b0f80 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak="; + hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k="; }; propagatedBuildInputs = [ From a718c7ace9681f0b8d919217a4fd9aca99e4e48d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:47:42 +0100 Subject: [PATCH 075/117] python310Packages.google-cloud-tasks: 2.12.1 -> 2.13.0 Changelog: https://github.com/googleapis/python-tasks/blob/v2.13.0/CHANGELOG.md --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 8751b583729b..3ab5abb61d90 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.12.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; + hash = "sha256-7V57grRH2ysU765TDmqq7DOna9o8Nu9v4HjDAIf/ETA="; }; propagatedBuildInputs = [ From d94a28b6648d6e66a461a70cb149fc1c4196269f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:50:20 +0100 Subject: [PATCH 076/117] python310Packages.google-cloud-resource-manager: 1.8.1 -> 1.9.0 Changelog: https://github.com/googleapis/python-resource-manager/blob/v1.9.0/CHANGELOG.md --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index b2aa7804b601..af5bc6855b53 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.8.1"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; + hash = "sha256-LRSAJoqdqMbNlQhoH7YQ9cZ3g7Iq4pkItaxTQTGZw1E="; }; propagatedBuildInputs = [ From e3cc4c657f497805979c447d201350cac9bbe86a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:51:07 +0100 Subject: [PATCH 077/117] python310Packages.google-cloud-translate: 3.10.1 -> 3.11.0 Changelog: https://github.com/googleapis/python-translate/blob/v3.11.0/CHANGELOG.md --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 6ae9ff0ea946..e6744bd66f52 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.10.1"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM="; + hash = "sha256-phwMOu6YEndLOOvXDnoYvShXGMMR+O/CfUyp5+gMdKM="; }; propagatedBuildInputs = [ From 8cef051f0736e799a576f2b6012a3ef4c4967ef8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:52:12 +0100 Subject: [PATCH 078/117] python310Packages.google-cloud-videointelligence: 2.10.1 -> 2.11.0 Changelog: https://github.com/googleapis/python-videointelligence/blob/v2.11.0/CHANGELOG.md --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index b8019c03cc5f..e8707e9d9d3f 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE="; + hash = "sha256-rkqKaHNzbcIjYyCe+AN1WCLvjZ1HjWHH4xeCs8/TkZI="; }; propagatedBuildInputs = [ From e203b5f1b6be590244817d3ae7d10099cd155485 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:53:07 +0100 Subject: [PATCH 079/117] python310Packages.google-cloud-dlp: 3.11.1 -> 3.12.0 Changelog: https://github.com/googleapis/python-dlp/blob/v3.12.0/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 86888e3fb621..94941e4eef3c 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.11.1"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI="; + hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4="; }; propagatedBuildInputs = [ From e574963104b8df2b8432cd86f6d24d02da438858 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 08:54:12 +0100 Subject: [PATCH 080/117] python310Packages.google-resumable-media: 2.4.0 -> 2.4.1 Changelog: https://github.com/googleapis/google-resumable-media-python/blob/v2.4.1/CHANGELOG.md --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 3dda409f155e..b39e550860ad 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; + hash = "sha256-Fbii5130LcZQLRMG2wvOJke6YBP5zQO24XNowIhu6Qo="; }; propagatedBuildInputs = [ From e071beded7231aaa46e3a8771524ce020e43cbdc Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 11:25:30 +0300 Subject: [PATCH 081/117] linux-firmware: 20230210 -> 20230310 --- pkgs/os-specific/linux/firmware/linux-firmware/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 4e59ca0b89eb..eb917fc68de5 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,6 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20230210"; - sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA="; - outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8="; + version = "20230310"; + sourceHash = "sha256-a0Or/ov+YDbDbyUy65j95wgW1ZBo2LIxYWR7L6z6Usw="; + outputHash = "sha256-BL1dSTAjg5F1JWhoVYelMJRv+lMZNA8S7FbGIQWemMo="; } From 50865cc9a4cc76eaaa6a0c05d572a94b1d5c49be Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 13 Mar 2023 16:48:59 +0800 Subject: [PATCH 082/117] maintainers: add Aleksana --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5de888ff52ff..ffbc8afc867c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -578,6 +578,12 @@ githubId = 43479487; name = "Titouan Biteau"; }; + aleksana = { + email = "me@aleksana.moe"; + github = "Aleksanaa"; + githubId = 42209822; + name = "Aleksana QwQ"; + }; alekseysidorov = { email = "sauron1987@gmail.com"; github = "alekseysidorov"; From 9abb4679bc665f28a7499833d2ba0c8c6df2532c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 10:31:23 +0100 Subject: [PATCH 083/117] python3Packages.dbus-python-client-gen: add changelog to meta --- .../python-modules/dbus-python-client-gen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index c01613864b32..d1646a4cef49 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-RYgS4RNLLCtp+5gS/LlzdH7rlub48TSSSKhykkkBcuo="; }; @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for generating dbus-python client code"; homepage = "https://github.com/stratis-storage/dbus-python-client-gen"; + changelog = "https://github.com/stratis-storage/dbus-python-client-gen/blob/v${version}/CHANGES.txt"; license = licenses.mpl20; maintainers = with maintainers; [ nickcao ]; }; From 3f90d05499d6549b00a8b32d82778661606a2573 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Mar 2023 10:45:32 +0100 Subject: [PATCH 084/117] python310Packages.dbus-python-client-gen: disable on unsupported Python releases --- .../python-modules/dbus-python-client-gen/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index d1646a4cef49..3c7d91ebed5e 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -4,11 +4,15 @@ , into-dbus-python , dbus-python , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "dbus-python-client-gen"; version = "0.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stratis-storage"; From 4d415633845cb1ebfd5331eae47f0d45ca4d0a7a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 11:15:18 +0100 Subject: [PATCH 085/117] haskellPackages.graphql: allow hspec 2.9 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 37ea8c02a936..f598758f4a0c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -285,6 +285,11 @@ self: super: { opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv); opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra); + # Too strict lower bound on hspec + graphql = + assert lib.versionOlder self.hspec.version "2.10"; + doJailbreak super.graphql; + # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; From 94c2ac518d99205f96f33859a6d91b8969be1459 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 11:24:50 +0100 Subject: [PATCH 086/117] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1791899](https://hydra.nixos.org/eval/1791899) of nixpkgs commit [5cc155a](https://github.com/NixOS/nixpkgs/commits/5cc155a50986c0e29f6e6043290a035f917506c6) as of 2023-03-13 09:59 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 12 +++++++ .../transitive-broken.yaml | 15 ++++++--- .../haskell-modules/hackage-packages.nix | 33 +++++++++++++++++-- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6a92e4c457d1..e224bfd4f54d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -296,6 +296,7 @@ broken-packages: - azure-email - azurify - b9 + - babl # wants pkg-config dependency `babl`, but pkgs.babl's pkg-config file is called babl-0.1.pc - backprop - backstop - backtracking-exceptions @@ -471,6 +472,7 @@ broken-packages: - brians-brain - brick-dropdownmenu - brick-filetree + - brick-list-search # failure in job https://hydra.nixos.org/build/211236614 at 2023-03-13 - bricks-internal - brick-tabular-list - brillig @@ -487,6 +489,7 @@ broken-packages: - bson-generics - bson-mapping - bsparse + - btree-concurrent # dependency missing in job https://hydra.nixos.org/build/211250233 at 2023-03-13 - btrfs - buffer - buffer-builder-aeson @@ -731,6 +734,7 @@ broken-packages: - clone-all - closure - cloudfront-signer + - clplug # failure in job https://hydra.nixos.org/build/211239834 at 2023-03-13 - clr-inline - clr-typed - cluss @@ -1458,6 +1462,7 @@ broken-packages: - fastedit - fastly - fast-nats + - fastparser # failure building library in job https://hydra.nixos.org/build/211240748 at 2023-03-13 - fastpbkdf2 - FastPush - fast-tagsoup-utf8-only @@ -2883,7 +2888,9 @@ broken-packages: - jvm-binary - jvm-parser - JYU-Utils + - k8s-wrapper # test failure in job https://hydra.nixos.org/build/211254982 at 2023-03-13 - kademlia + - kafka-client # dependency missing in job https://hydra.nixos.org/build/211238496 at 2023-03-13 - kafka-client-sync - kalman - Kalman @@ -3285,6 +3292,7 @@ broken-packages: - medium-sdk-haskell - meep - megalisp + - megastore # failure in job https://hydra.nixos.org/build/211239200 at 2023-03-13 - melf - mellon-core - melody @@ -3596,6 +3604,7 @@ broken-packages: - neural-network-hmatrix - newbase60 - newhope + - newline # dependency missing in job https://hydra.nixos.org/build/211250825 at 2023-03-13 - newports - newsletter - newt @@ -4281,6 +4290,7 @@ broken-packages: - quantification - quantum-arrow - quarantimer + - qudb # failure building executable 'qudb' in job https://hydra.nixos.org/build/211250260 at 2023-03-13 - quenya-verb - querystring-pickle - questioner @@ -4590,6 +4600,7 @@ broken-packages: - sandlib - sandman - sarasvati + - sasha # dependency missing in job https://hydra.nixos.org/build/211237944 at 2023-03-13 - sat - satchmo-backends - satchmo-minisat @@ -5796,6 +5807,7 @@ broken-packages: - whiskers - whois - why3 + - wide-word-instances # failure building library in job https://hydra.nixos.org/build/211245524 at 2023-03-13 - WikimediaParser - willow - windns diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d76ef96daf4..9ca4158e8248 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -676,10 +676,10 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows - - ascii-superset_1_2_7_0 + - ascii-superset_1_3_0_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_5_4_0 + - ascii_1_6_0_0 - asic - asil - assert4hs-hspec @@ -1397,6 +1397,7 @@ dont-distribute-packages: - eventuo11y-batteries - eventuo11y-json - eventuo11y-otel + - eventuo11y-prometheus - every-bit-counts - ewe - exference @@ -1577,6 +1578,7 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-appendful + - genvalidity-dirforest - genvalidity-network-uri - genvalidity-sydtest - genvalidity-sydtest-aeson @@ -2199,6 +2201,8 @@ dont-distribute-packages: - hoppy-std - horizon-gen-nix - horizon-spec + - horizon-spec-lens + - horizon-spec-pretty - hotswap - hp2any-graph - hp2any-manager @@ -2471,6 +2475,7 @@ dont-distribute-packages: - kansas-lava-shake - karakuri - katip-rollbar + - keelung - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel - keera-hails-mvc-model-protectedmodel @@ -2554,6 +2559,7 @@ dont-distribute-packages: - latex-formulae-pandoc - latex-svg-hakyll - latex-svg-pandoc + - launchdarkly-server-sdk-redis-hedis - layered-state - layers-game - layouting @@ -2802,7 +2808,6 @@ dont-distribute-packages: - morley-upgradeable - morloc - morphisms-functors-inventory - - mosaico-lib - motor-diagrams - mp - mp3decoder @@ -3005,7 +3010,7 @@ dont-distribute-packages: - padKONTROL - pairing - panda - - pandoc-crossref_0_3_15_0 + - pandoc-crossref_0_3_15_1 - pandoc-highlighting-extensions - pandoc-japanese-filters - pandora-io @@ -3988,7 +3993,6 @@ dont-distribute-packages: - type-sub-th - typed-admin - typed-encoding-encoding - - typed-spreadsheet - typed-streams - typedflow - typelevel @@ -4147,6 +4151,7 @@ dont-distribute-packages: - websockets-rpc - websockets-simple - websockets-simple-extra + - weierstrass-functions - weighted - werewolf-slack - wgpu-hs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fb12f865096f..bff5cd98c46f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -39852,6 +39852,8 @@ self: { libraryPkgconfigDepends = [ babl ]; description = "Haskell bindings to BABL library"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -49143,6 +49145,8 @@ self: { libraryHaskellDepends = [ base brick containers microlens vector ]; description = "Search forward or backward for certain kinds of items in brick list"; license = lib.licenses.bsd0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "brick-panes" = callPackage @@ -49933,6 +49937,8 @@ self: { ]; description = "A backend agnostic, concurrent BTree"; license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "btrfs" = callPackage @@ -61607,6 +61613,8 @@ self: { ]; description = "Create Core Lightning Plugins"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clr-bindings" = callPackage @@ -94654,6 +94662,7 @@ self: { libraryHaskellDepends = [ base containers eventuo11y prometheus ]; description = "Prometheus backend for eventuo11y"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "every" = callPackage @@ -97519,6 +97528,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fastpbkdf2" = callPackage @@ -109322,6 +109333,7 @@ self: { ]; description = "Generators for typed directory forests"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -145792,6 +145804,7 @@ self: { libraryHaskellDepends = [ base horizon-spec lens ]; description = "Horizon Stable Package Set Lenses"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "horizon-spec-pretty" = callPackage @@ -145807,6 +145820,7 @@ self: { ]; description = "Horizon Stable Package Set Pretty Printer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "horizontal-rule" = callPackage @@ -169746,6 +169760,8 @@ self: { ]; description = "Application wrapper for the k8s environment"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kademlia" = callPackage @@ -169799,6 +169815,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kafka-client-sync" = callPackage @@ -170762,6 +170780,7 @@ self: { ]; description = "DSL for creating zero-knowledge proofs"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "keenser" = callPackage @@ -176227,6 +176246,7 @@ self: { ]; description = "LaunchDarkly Server-Side SDK - Redis Integration"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -190138,7 +190158,9 @@ self: { ]; description = "Bulk image or strict bytestring storage"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "megastore"; + broken = true; }) {}; "meldable-heap" = callPackage @@ -197664,7 +197686,6 @@ self: { ]; description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mosquitto-hs" = callPackage @@ -205034,6 +205055,8 @@ self: { libraryHaskellDepends = [ base text ]; description = "newline specifications as values"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "newports" = callPackage @@ -235994,7 +236017,9 @@ self: { executableToolDepends = [ alex happy ]; description = "Quite Useless DB"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "qudb"; + broken = true; }) {}; "quenya-verb" = callPackage @@ -251789,6 +251814,8 @@ self: { testToolDepends = [ alex ]; description = "A staged lexer generator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sasl" = callPackage @@ -297225,7 +297252,6 @@ self: { executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -310512,6 +310538,7 @@ self: { testHaskellDepends = [ base gamma tasty tasty-hunit ]; description = "Weierstrass Elliptic Functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "weigh" = callPackage @@ -310954,6 +310981,8 @@ self: { libraryHaskellDepends = [ base binary serialise wide-word ]; description = "Instances for wide-word"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage From b0908bb1121e4db2a22b077dc9de3e7b465793c9 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 13 Mar 2023 11:53:05 +0100 Subject: [PATCH 087/117] jellyfin-mpv-shim: 2.5.0 -> 2.6.0 --- pkgs/applications/video/jellyfin-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 88cc0b899a7d..81bfbe4a39b0 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-B9orjQojiLwC90LZ4ynY7niw6fhJIaUn/DUXAYVMjfg="; + sha256 = "sha256-90Z2vgYT/9hBQZgfXeY7l6sGwT5KEY8X4rZMgrbTwrM="; }; nativeBuildInputs = [ From daeaaf78a53cb0c5ce9cb4dbc2ec279bec4013cd Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 13 Mar 2023 11:57:29 +0100 Subject: [PATCH 088/117] protoc-gen-go: 1.28.1 -> 1.29.0 --- pkgs/development/tools/protoc-gen-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 659b9c2c2ace..53ddf571df23 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM="; + sha256 = "sha256-su8upKXi7mvalk+Fa/sGGFizAXisHiBCc5OVIizujwI="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; From 06e575573c9f31bb2d84885afbc8f9273dd380c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 13 Mar 2023 11:24:58 +0000 Subject: [PATCH 089/117] erlang-ls: fix build --- pkgs/development/beam-modules/erlang-ls/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index fdd4548c663f..f5390e186c08 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -30,10 +30,9 @@ rebar3Relx { releaseType = "escript"; beamDeps = builtins.attrValues deps; - # Skip "els_hover_SUITE" test for Erlang/OTP 25+ while upstream hasn't fixed it - # https://github.com/erlang-ls/erlang_ls/pull/1402 - postPatch = lib.optionalString (lib.versionOlder "25" erlang.version) '' - rm apps/els_lsp/test/els_hover_SUITE.erl + # https://github.com/erlang-ls/erlang_ls/issues/1429 + postPatch = '' + rm apps/els_lsp/test/els_diagnostics_SUITE.erl ''; buildPlugins = [ rebar3-proper ]; From 5c0d228b6fee8efe1c163e71d11256610e6463a4 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:06 +0300 Subject: [PATCH 090/117] Revert "linux: fix `brcmfmac` driver" This reverts commit 141317dff92656e67ffb726c727766ceffcba52b. --- pkgs/os-specific/linux/kernel/patches.nix | 9 --------- pkgs/top-level/linux-kernels.nix | 11 +---------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 68436fbf97a7..5912abf4181d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -62,13 +62,4 @@ name = "fix-em-ice-bonding"; patch = ./fix-em-ice-bonding.patch; }; - - # https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf - fix-brcmfmac = { - name = "fix-brcmfmac"; - patch = fetchpatch { - url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw"; - sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds="; - }; - }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a713535aef57..14767d88c1f3 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -34,8 +34,6 @@ let major = lib.versions.major version; sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256; modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion; - # FIXME remove as soon as the revert happened upstream! - basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches; in kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv lib version; @@ -51,7 +49,7 @@ let broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); }; }; - kernelPatches = basePatches ++ [ + kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true; @@ -106,7 +104,6 @@ in { # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - kernelPatches.fix-brcmfmac ]; }; @@ -115,7 +112,6 @@ in { [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.fix-brcmfmac ]; }; @@ -124,7 +120,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.fix-brcmfmac ]; }; @@ -139,7 +134,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.fix-brcmfmac ]; }; @@ -156,7 +150,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; @@ -173,7 +166,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; @@ -182,7 +174,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.fix-em-ice-bonding - kernelPatches.fix-brcmfmac ]; }; From 44784a2f8e311fd44dc1adb3f19d31f61903a96b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:24 +0300 Subject: [PATCH 091/117] linux: 4.14.308 -> 4.14.309 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 695b3a83dd9a..fbc5c4f365e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.308"; + version = "4.14.309"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i"; + sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09"; }; } // (args.argsOverride or {})) From 3bdd65d54d02a5bae242e08ed971ae825638586a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:31 +0300 Subject: [PATCH 092/117] linux: 4.19.276 -> 4.19.277 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5c083d7d5307..5d0bc148da55 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.276"; + version = "4.19.277"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f"; + sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn"; }; } // (args.argsOverride or {})) From fea95ea6b91264065c613e20d31b211780e7d1a4 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:37 +0300 Subject: [PATCH 093/117] linux: 5.10.173 -> 5.10.174 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 7a4ed4be995d..94e55a5714a6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.173"; + version = "5.10.174"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l"; + sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig"; }; } // (args.argsOverride or {})) From 92ffd72db0c6157cfee142e43bf5dca33c10ec17 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:42 +0300 Subject: [PATCH 094/117] linux: 5.15.101 -> 5.15.102 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index fcda80e68756..a2bd4e054c8c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.101"; + version = "5.15.102"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bf0s3qw1k0p13f5cnircajfyr3j22yp9jx4l62iarxbn1k20fdr"; + sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724"; }; } // (args.argsOverride or { })) From 5092a2e3622ab50c1b106cde13c27dda06f8b48d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:48 +0300 Subject: [PATCH 095/117] linux: 5.4.235 -> 5.4.236 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8ad01e4ae3a1..e62fa1c41c43 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.235"; + version = "5.4.236"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq"; + sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c"; }; } // (args.argsOverride or {})) From 001992de732c4515d579c994a4da70b372a3f58a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:38:54 +0300 Subject: [PATCH 096/117] linux: 6.1.18 -> 6.1.19 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 61b4835849dc..ec276b05acff 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.18"; + version = "6.1.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4"; + sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy"; }; } // (args.argsOverride or { })) From b088383b8c19834c5daa4b476b533433daacaa63 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 13 Mar 2023 14:41:24 +0300 Subject: [PATCH 097/117] linux: 6.2.5 -> 6.2.6 --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index e2e9e74a0a67..790d9aae9f14 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.5"; + version = "6.2.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5"; + sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz"; }; } // (args.argsOverride or { })) From 594c6593fced4cdf4a6785e370d21b023d1a15c3 Mon Sep 17 00:00:00 2001 From: Niols Date: Fri, 10 Mar 2023 11:49:45 +0100 Subject: [PATCH 098/117] topiary: unstable-2023-01-10 -> 0.1.0 --- pkgs/development/tools/misc/topiary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix index 06f75284b5cf..8a38ec4663c8 100644 --- a/pkgs/development/tools/misc/topiary/default.nix +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topiary"; - version = "unstable-2023-01-10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "tweag"; repo = pname; - rev = "c36d4a2253f337e1a28d497826a84754b8d833f6"; - sha256 = "sha256-0uqDuEpL9JCXzD7sQ3PDv4N1KtCSkoMoD5i402uIfas="; + rev = "v${version}"; + sha256 = "sha256-Gm6AzzVLUXZi2jzJ1b/c4yjIvRRA2e5mC2CMVyly2X8="; }; - cargoSha256 = "sha256-PvMjLC133rlsPrgyESuVHIf2TPCtgGQQULCQvBTIJ20="; + cargoSha256 = "sha256-2Ovwntg3aZyR73rg8ruA/U1wVS1BO+B7r37D6/LPa/g="; postInstall = '' install -Dm444 languages/* -t $out/share/languages From 5378cbc23de319033775e7bb2baf246ac1b4bf02 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 12 Mar 2023 14:11:20 +0100 Subject: [PATCH 099/117] vivaldi: Add support for aarch64-linux --- .../networking/browsers/vivaldi/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ec9ba8dddb9a..d28e7d151370 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -23,9 +23,17 @@ in stdenv.mkDerivation rec { pname = "vivaldi"; version = "5.7.2921.53"; + suffix = { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { - url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8="; + url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; + hash = { + aarch64-linux = "sha256-U8mRXXLqBxc+humj4Cz9x5q75KC+H3pXlVe0rp1Hat0="; + x86_64-linux = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; unpackPhase = '' @@ -106,6 +114,6 @@ in stdenv.mkDerivation rec { license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ otwieracz badmutex ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From 623604cfd3bc38e880d28a8dc5ac0d0ab5236f23 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Mar 2023 13:25:09 +0000 Subject: [PATCH 100/117] webrtc-audio-processing: use HTTPS homepage --- pkgs/development/libraries/webrtc-audio-processing/0.3.nix | 2 +- pkgs/development/libraries/webrtc-audio-processing/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index c9fafdd27667..9bd035bfc01f 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 5a53564603d8..c9097a701006 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; # attempts to inline 256bit AVX instructions on x86 From c9ace28c9f0381cef83ecda46cf1f1051589d585 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Mar 2023 13:26:44 +0000 Subject: [PATCH 101/117] webrtc-audio-processing: tighten platforms webrtc-audio-processing only builds for specifically listed architectures, so we shouldn't mark it as being supported on all of them. I've also changed the x86_32 breakage to be marked with meta.broken, as it's more semantically appropriate. --- pkgs/development/libraries/webrtc-audio-processing/0.3.nix | 4 +++- .../development/libraries/webrtc-audio-processing/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 9bd035bfc01f..b8a93603ea31 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - platforms = platforms.unix; + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/rtc_base/system/arch.h + # + our patches + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); }; } diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index c9097a701006..9a95494558b8 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -36,8 +36,10 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86); # attempts to inline 256bit AVX instructions on x86 # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 - platforms = lib.lists.subtractLists platforms.i686 platforms.unix; + broken = stdenv.isx86_32; }; } From a8693e7cc253ca0059783f55b14fe9cb07049da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 13 Mar 2023 10:57:00 -0300 Subject: [PATCH 102/117] zfsUnstable: increase compatiblity range (to linux 6.2) --- pkgs/os-specific/linux/zfs/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 1c909f3208ea..cd31cb14fa09 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -17,6 +17,7 @@ # for determining the latest compatible linuxPackages , linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 +, linuxPackages_6_2 ? pkgs.linuxKernel.packages.linux_6_2 }: let @@ -233,8 +234,17 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxPackages_6_1; + # NOTE: + # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 + # for future releases, please delete this condition. + kernelCompatible = + if kernel.stdenv.isx86_64 + then kernel.kernelOlder "6.3" + else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = + if kernel.stdenv.isx86_64 + then linuxPackages_6_2 + else linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the From 919549def7247a3281f7b12a7e1c7402d01e4f75 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2023 11:31:44 +0800 Subject: [PATCH 103/117] lucky-cli: 0.30.0 -> 1.0.0 --- pkgs/development/web/lucky-cli/default.nix | 4 ++-- pkgs/development/web/lucky-cli/shard.lock | 4 ++-- pkgs/development/web/lucky-cli/shards.nix | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index b62464d2649a..44b4af440800 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.30.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - hash = "sha256-fgrfVqRcb8xdvZ33XW3lBwR1GhjF/WeAglrPH2Fw31I="; + hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE="; }; # the integration tests will try to clone a remote repos diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index a81bcf48300b..9bf2212760ad 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,7 +2,7 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 1.0.0 + version: 1.1.0 lucky_task: git: https://github.com/luckyframework/lucky_task.git @@ -10,7 +10,7 @@ shards: nox: git: https://github.com/matthewmcgarvey/nox.git - version: 0.2.0 + version: 0.2.2 teeplate: git: https://github.com/luckyframework/teeplate.git diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index ea85b4b52e9b..fef8c1602ba1 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -1,8 +1,8 @@ { ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.0.0"; - sha256 = "01cgapdpk8dg7sdgnq6ql42g3kv5z2fmsc90z07d9zvjp9vs2idp"; + rev = "v1.1.0"; + sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8"; }; lucky_task = { url = "https://github.com/luckyframework/lucky_task.git"; @@ -11,8 +11,8 @@ }; nox = { url = "https://github.com/matthewmcgarvey/nox.git"; - rev = "v0.2.0"; - sha256 = "041wh7nbi8jxg314p5s4080ll9ywc48knpxmrzwj5h4rgmk7g231"; + rev = "v0.2.2"; + sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; }; teeplate = { url = "https://github.com/luckyframework/teeplate.git"; From 07f14e42c41820b056fd8cb48dccc7e0b8f76cbe Mon Sep 17 00:00:00 2001 From: ~fonnyx-nopmer Date: Wed, 8 Mar 2023 19:08:46 +0000 Subject: [PATCH 104/117] openmw-tes3mp: unstable-2020-08-07 -> 0.8.1, unbreak --- pkgs/games/openmw/tes3mp.nix | 56 +++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 09eec3ef1e12..f236bc8cd5e5 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -3,13 +3,9 @@ , cmake , openmw , fetchFromGitHub -, formats , luajit , makeWrapper , symlinkJoin -, mygui -, crudini -, bullet }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -18,17 +14,22 @@ let # raknet could also be split into dev and lib outputs raknet = stdenv.mkDerivation { pname = "raknet"; - version = "unstable-2018-07-14"; + version = "unstable-2020-01-19"; src = fetchFromGitHub { owner = "TES3MP"; repo = "CrabNet"; # usually fixed: # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 - rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; - sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; + rev = "19e66190e83f53bcdcbcd6513238ed2e54878a21"; + sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA="; }; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DCRABNET_ENABLE_DLL=OFF" + ]; + nativeBuildInputs = [ cmake ]; installPhase = '' @@ -38,14 +39,14 @@ let coreScripts = stdenv.mkDerivation { pname = "corescripts"; - version = "unstable-2020-07-27"; + version = "0.8.1"; src = fetchFromGitHub { owner = "TES3MP"; repo = "CoreScripts"; # usually latest in stable branch (e.g. 0.7.1) - rev = "3c2d31595344db586d8585db0ef1fc0da89898a0"; - sha256 = "sha256-m/pt2Et58HOMc1xqllGf4hjPLXNcc14+X0h84ouZDeg="; + rev = "6ae0a2a5d16171de3764817a7f8b1067ecde3def"; + sha256 = "8j/Sr9IRMNFPEVfFzdb42PckHS3KW7FH7x7rRxIh5gY="; }; buildCommand = '' @@ -59,20 +60,19 @@ let # case the scripts or wrapper scripts change. unwrapped = openmw.overrideAttrs (oldAttrs: rec { pname = "openmw-tes3mp-unwrapped"; - version = "unstable-2020-08-07"; + version = "0.8.1"; src = fetchFromGitHub { owner = "TES3MP"; - repo = "openmw-tes3mp"; + repo = "TES3MP"; # usually latest in stable branch (e.g. 0.7.1) - rev = "ce5df6d18546e37aac9746d99c00d27a7f34b00d"; - sha256 = "sha256-xLslShNA6rVFl9kt6BNGDpSYMpO25jBTCteLJoSTXdg="; + rev = "68954091c54d0596037c4fb54d2812313b7582a1"; + sha256 = "8/bV4sw7Q8l8bDTHGQ0t4owf6J6h9q468JFx4KegY5o="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs) - ++ [ luajit ]; + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -108,16 +108,24 @@ let license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; }; }); - cfgFile = (formats.ini { }).generate "tes3mp-server.cfg" { - Plugins.home = "${coreScripts}/share/openmw-tes3mp/CoreScripts"; - }; + tes3mp-server-run = '' + config="''${XDG_CONFIG_HOME:-''$HOME/.config}"/openmw + data="''${XDG_DATA_HOME:-''$HOME/.local/share}"/openmw + if [[ ! -f "$config"/tes3mp-server.cfg && ! -d "$data"/server ]]; then + mkdir -p "$config" + echo [Plugins] > "$config"/tes3mp-server.cfg + echo "home = $data/server" >> "$config"/tes3mp-server.cfg + mkdir -p "$data" + cp -r ${coreScripts}/share/openmw-tes3mp/CoreScripts "$data"/server + chmod -R u+w "$data"/server + fi + ''; in -symlinkJoin rec { +symlinkJoin { name = "openmw-tes3mp-${unwrapped.version}"; inherit (unwrapped) version meta; @@ -125,18 +133,14 @@ symlinkJoin rec { paths = [ unwrapped ]; - # crudini --merge will create the file if it doesn't exist postBuild = '' mkdir -p $out/bin - dir=\''${XDG_CONFIG_HOME:-\$HOME/.config}/openmw - makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \ --chdir "$out/bin" makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \ - --run "mkdir -p $dir" \ - --run "${crudini}/bin/crudini --merge $dir/${cfgFile.name} < ${cfgFile}" \ + --run '${tes3mp-server-run}' \ --chdir "$out/bin" ''; } From 8e34e66f40225086723934e742df89f1bf808554 Mon Sep 17 00:00:00 2001 From: "\"Ilan Joselevich\"" <"personal@ilanjoselevich.com"> Date: Mon, 13 Mar 2023 16:38:56 +0200 Subject: [PATCH 105/117] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 376 +++++++++--------- 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e0e9b3791217..5a14c1fb81bb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "3ad20aeee036378478bfb75788c6e287964ece8e"; - sha256 = "1wjj3gv3qpa9liy7sz14ah7np6k3qw5vnkx6qggm9rzcrqf7jidp"; + rev = "783a23c70ca6b43b4591fce9bdfeda408e2d6415"; + sha256 = "0a9ys9d2b6hj0vi7x6x20s6dh09slm851wy9kn7ya43vycvx4v2h"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "083485d0ec106c46eb38b525342dc8e23a9921c9"; - sha256 = "1bcjh8a3mqvnbgp12c3ln7snwaarrdsn33bi1lwvcdas341gk23v"; + rev = "1dc606bf07e1419d785e04d6dbb8585987d817cc"; + sha256 = "0l7vmvr5rfn7bjaia505aqwwvvhpbc3f6mfn8q49an3nngwf2plh"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -703,12 +703,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-03-08"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "31113f89c8b558f59cf3867079c8c5520b6945ba"; - sha256 = "02ivk0fvgvryjnhgvh8la9minmrg90dgvmgbwav2y17ir5ypv45p"; + rev = "560fb5aa401bee5f2ee86084f338f300ff57aede"; + sha256 = "1avznnh7z48nshxab7d3rlkcjqanwx9x95rxpzbg4vcn3fp1szb6"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -835,12 +835,12 @@ final: prev: barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-03-07"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "65df9a7d51f11df6bd4f8bd9f0d8b378e92bb9b0"; - sha256 = "1kaa12cr02bc1p9ywr9l6zd0pb1dpjdcn6m4m65fxd97sdqn97wj"; + rev = "d60fb8d8e240e5be04a20636f5b35b05a0d4712c"; + sha256 = "1lf4kwzpx87hvihzgmmpgm83wpkpzf7iav5yb46b3bf3b4cfjl9j"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1063,12 +1063,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4869fb385990ec0495e0f175fdd01bd388a7e839"; - sha256 = "0bb79zj40792grrw1lzqd6ssxqacacblb3szxwvnm9pwps9nc1jw"; + rev = "f99a9e49f2f3e929364850a1aaa1b23aef5fca62"; + sha256 = "1942iipkm67ibyvwbll6prsfqhjxq638spcwdw4k9hgzb1f3n3cy"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -2095,24 +2095,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "3a32343a473cce5288a9732f90df67c533642427"; - sha256 = "0vr3l8f251qdn986pnwl6pwl1mf66wddd0kj8bhzcfi4zjg5sp1q"; + rev = "ee1814e2183bd424ca5528f82f3d6ce8f64e6f90"; + sha256 = "0r4hl4w29mg9yg847ivsv1xhm3lq664989l2s8gzxbwypfs3kv3v"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "0c42b34cf7f53bd90c378cc9ddd5b85344ac08f6"; - sha256 = "0m90yvbnr79xhj7jgkbj3qk7wdidmqf88bda94s5yl8rjjb50am7"; + rev = "e7c186c9cca268e9337077256544fa9fb86e7bbb"; + sha256 = "11wv9cgs7nbknvgc4nsgwgs4yv234wy7z78x0z58ci3r55zhablw"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2131,12 +2131,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b33c5e010067a2d9674ad5253858da6489ae65d6"; - sha256 = "1s23c1j95a73cxc1fxwbncv4z74gf8pw9p0kk6qz22xpk6zcypv7"; + rev = "4b4b93dbbfc871a3d32a244a4276ee06696c21bb"; + sha256 = "1fkj6ps167sq12y96cdksf7ipfgrh01z1p107x7akynfnyrlny1r"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2167,12 +2167,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-03-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "8d96e24fc244a04cd5a7de1666b077b1b4deef73"; - sha256 = "0y4nhwwwyp83gzax1klw5w72l8f3v89b7pkac3xph5qvxk06njn1"; + rev = "aa94d3844d6a12b1a8bf73c8a242ff2f540fb749"; + sha256 = "19k9p5jamm5vax66swyy594am4zw97i2p8sx57b3xhwssp6mvx48"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2275,12 +2275,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "6e31bf683a1852399ace9914edfd3aa1be3e5e23"; - sha256 = "17h3awklj9x8k3w09c8hzy01nv07i5hwg5qm3y443xi6gs578apv"; + rev = "937524714999c3c5a096f839dc22dd77344e1567"; + sha256 = "0fy0pqzifkf5wsaqskjn9ca3dbnm7s0p55an47y2z101b7akbrcs"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2661,12 +2661,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-03-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "e783ed49acc6b210b295af5c792de811f99559be"; - sha256 = "0xngir0bsg9p9hkqk0sjhrarjrynd5vmyxx32ckdsvccxlqqiwqf"; + rev = "ebcbe90401555272025006db00da0972f7e0db63"; + sha256 = "1zcapd1dwwqz9035h3rg2z582v7z49d03h0g28yi208xjm1wmwih"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2757,12 +2757,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "6e2b0920f5836aaf882b43ee52700d3f509cdd1d"; - sha256 = "0qq4v8ya84rnq6rhmfsannpczqyqb8jw1iflnyw6875fa3rf3qn3"; + rev = "5b875ac1aeba22abce3c499c0d5e4f33558fdf2c"; + sha256 = "1pnbhhqbaxp5jhdgs4g1a6fym7x2855lss2ykj5wdd21wna77rhn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2843,12 +2843,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "722deb460aae7f94e36bb3b069c787ed5fa357c3"; - sha256 = "04fks4xz0f50dak837775dlydphg2hxhqm69v3k1950jw7nh20q4"; + rev = "634cef5919b14d0c68cec6fc7b094554e8ef9d7f"; + sha256 = "1vrnvn7xgzdz1zn0wi516l96nkmi5jnwqzar5v9x0xdszjhqa553"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -2988,12 +2988,12 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-03-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "438c8b8ff8bc02e5c6650d55ec0094f56697f70a"; - sha256 = "1kby1448pqi3fgmmkkfd5ms1ln13hab3g4xnnm1cy9bppa441p24"; + rev = "17bbf3e51d67f77f6adacbfc965734a3dccb02a3"; + sha256 = "0jmkx1alfsz1xmf39alwky7l4nl2m79nsqwad7sfi1vp8y3b7p99"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3048,12 +3048,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "31f75ae70780cb593bbd3b5179203a9e2b05cefa"; - sha256 = "0yh8idxnsi9m6y33ma4a9zxailfvygag51i6g2nfcjx7jazijjbw"; + rev = "467847f694beb2e6496c83e56631d7dfae901a9d"; + sha256 = "0ydmd6yvwjrrsb1b13i4d2v26bdivfbzlv54ggylwyi7bzfm28xm"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "009887b76f15d16f69ae1341f86a7862f61cf2a1"; - sha256 = "01haswbnqmjb4lyg25kimy09bsnwf9dn78bgy6jib4fkhv598dpw"; + rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9"; + sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3192,12 +3192,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "a553b614f1b89fdbf645efef977f4b7aa0fa6c19"; - sha256 = "1b0xny4w8g9r1rr17lnl675qplb5smkx8jyq0z15192i2714ksgi"; + rev = "60ce55d8546188de614cd111f4d26932c70f0fb7"; + sha256 = "15v9s2bq55nnirwpkkqb3d5ldfibnvqm4wf4afjkqj64bgk7kga2"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3240,12 +3240,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-03-09"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "347fa38461e86eda45f10a275b038386d4f608e1"; - sha256 = "0yhsch3z41jgnbi7972sqzycpfmirxp8mkfg383xkz1wbk62x1i6"; + rev = "d4659a919096a0488694338a9cf4fbb749080779"; + sha256 = "100qlgf6w0fpxfck77ag7m4rkx9k51dn2dk655rapzd1dnry241v"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3408,12 +3408,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "f80661a7109373aedee491acd8ddadc57e5c60aa"; - sha256 = "1fzc99r07hb5fis0jxzasblzwvczs6vpqldlj8nmcx06flis53ll"; + rev = "3b5b6b8aacfa5be9944b4cfe2673feb68a08655a"; + sha256 = "1pd8lqqdmyy3lz8x9i6g5kh02w7wydr90rqgzdm4f4cl5lm80p96"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3528,24 +3528,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-02-27"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "a0dc84816b913e9afcf6b8a5ade304bfb47a6f65"; - sha256 = "0i79v09f92vdznv2bad825kfqfa345jk81ls6imgak84vsigfvhf"; + rev = "4a6582f4137f4f303eb7d54ee31403ac0b675774"; + sha256 = "11n7hhwcjq5g583q6qq81ixhh3nprwbcgkz4r70p0sb9r6f0m1wj"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "331507561a46d6ce484f576299e0297e277bac7f"; - sha256 = "1myvjfyh8dyy0rpnbfcpljyamlnphavjhw4mzbrrq4wwm2lwcwb4"; + rev = "c6ef9c5a3a2ece0f8635460291eb4a4c06ed3dcc"; + sha256 = "1cnjdzg8l1dvr8lw3d5m4v880z7wd2y08ac5cl93p6wyzkz9m12i"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3611,12 +3611,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-03-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "344a3d968987f8e347053a89daadc6b026c8c458"; - sha256 = "14111h5fgrwj33s9kng7nzz9j8656xqcylw55qdddd07d2clcyph"; + rev = "47d30b754753da4b70a18dbfbcec89cf6f067dcd"; + sha256 = "1sb21nrbmyrl0ahqyjxksa34n9vbwwkd52bdhwj1nwp3yy7k4spb"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4079,12 +4079,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "3579d55c47366a536e07cf83df397a9f5f806813"; - sha256 = "1h40m2scxi8cswdjdxm5wq6bpv5ciza7zd0x3zdwi01cg73r5gyr"; + rev = "99d9f72122e92ba816c86e10ce8e97c555be99ba"; + sha256 = "0g6kly4kxik3bqh7iisypawrp4hrp104bim72wqbik92b079swav"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4235,12 +4235,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-03-07"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "dd4cabf7699ae8e2e17cfc29910ec605da32226d"; - sha256 = "0ymgfbn7hgvb7d5fqpi3q4gxrmy7m5njb5cc7rnvfg9wi5ici7np"; + rev = "2ff8eac67bed41005ea2032728a0336c784de611"; + sha256 = "1sfnxias9i1s3ppxpkg084bk1dpcxyd3f34sk9jxdr6v9101zpls"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4690,12 +4690,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-03-08"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "836d4f5a9970819b60b1010fd8709a2ff88416d8"; - sha256 = "1kskc6wyw4f7l2vwyyrc9bww3h6r2mqdxqyj66p9bhip97qr4i3d"; + rev = "54e06334a440b476fcc184fcf555cfd4ad9110c0"; + sha256 = "1pl7rndvvgy143aj6xc4znihp7c8skx790kah5ww94cq4mk2x6zs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,12 +4763,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-03-06"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "a31e011135a79d63c71254c250c9158e1056a1cb"; - sha256 = "0wqkq7qa64xrpw58hymq4skpx23nzcsfbbjlm76kv7hz4pp9q5a7"; + rev = "a81503f0019942111fe464209237f8b4e85f4687"; + sha256 = "0cc6yb5nb9nf27dp6dzrk8ynzbzsjg0qxsagggiv1w6bk8npgj24"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4787,12 +4787,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "e52225531a8b622ff79c6e11ffd3df9acea8327b"; - sha256 = "0k5c43jwxg4f0xpdrx4qzf83nc00170grx2crd593kij5aljmn50"; + rev = "10ff879fc56160e10437da5c1ca558371ddb6989"; + sha256 = "16m8iaikbfhff80f0yil330r7b0fcar346fkf1w8spkv6kj3qy3b"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4859,12 +4859,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "82693318b691de0676c17457b5d7d26a7798f761"; - sha256 = "0vks9yl7a3314yfq8kjghxbl4ag3zaxnjgara075wm7x9nkn0ycf"; + rev = "59d743370aa623ba2c5c1e48f3718058b13ec7b6"; + sha256 = "1zivc2pwr2k6ixqc8p86cf3ql0p2pf2nd7lvkhwj3904pkyfxk3h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5195,12 +5195,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-03-01"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "aec592bb1f0cf67f7e1123053d1eb17700aa9ed4"; - sha256 = "0axp9qaqczb3lir7ddb3i33c4nhyxckgln4vnv833a921hn0sg24"; + rev = "205184aa0e0f08e8a1249d9bb37b45bae85f01b9"; + sha256 = "166mgm7k7as2jppfw9x0mr64ynxqvkd4rbaq0hwbpq30najl2jlm"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5219,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-03-10"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "36b0be969326e70143bcd878d4a27f574eabc292"; - sha256 = "0cr4s1j1crfqh6ds5abxa4miqjky5pv7h24824i51ji2yv7vz8mm"; + rev = "48178e12a8b722f36ca9f0e8ff0a5487b45de493"; + sha256 = "03lnz99vg21qpraca8y6bkbmy1m04x5idxgxlad1y4gf9a6x1cag"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5243,12 +5243,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "418c54441da2506ee9c99150c38e3f350bcad8c4"; - sha256 = "1g9dzf2dhfm4vxqpcr075nh6gb62l79gv88khiq1y5958qw095cr"; + rev = "abdc346ff59c414698de551f876bcf3f223ed224"; + sha256 = "0vvhay3addl5pp48k2qifj88dimkspajx4am5lypiwifgq1gnjqk"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5399,24 +5399,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-02-23"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "95f95e346090ad96c657f021ad4d47f93c915598"; - sha256 = "1mimygy2815jd0k9fgh2f93dq3pgm44j6vibj5hbqz083vhvlp9m"; + rev = "631a7ccc7072fdc76e3597c2fc8030faf35771d1"; + sha256 = "14vvs18g7cy8amvy6pnq5342ryvx5h1s5078ml6ql2y04avhs1xa"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "9776e8881e976a340f1df693a04fd570b9198193"; - sha256 = "0kc7kqma8nz4hfy6c11mm2aa9jz2b5083qa38wqpshmz408va729"; + rev = "072f6fec596869b6cc5f58e86ef1ffd4d40135c4"; + sha256 = "1c9nmxcrlyf0qd027rdg5zhxpic8pkks7mqipkq86c23l3jyq483"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5543,12 +5543,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "a8044b084e0114609ec2c59cc4fa94c709a457d4"; - sha256 = "0pdszkzhlfi2fd3i04gxs8gy880qvbqicz6jf7db9abxby2zmfx3"; + rev = "8bb6713c56458aae339575b205234d820ec2046a"; + sha256 = "1895g32d00wgnfnj5r29q01ir0kgl3psa4bpwpqy6v4jzq45xz6g"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5567,24 +5567,24 @@ final: prev: nix-develop-nvim = buildVimPluginFrom2Nix { pname = "nix-develop.nvim"; - version = "2023-01-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "figsoda"; repo = "nix-develop.nvim"; - rev = "ce61f6d964232c86b522c292667841f42ebee618"; - sha256 = "0yfs2iws6d370scq4jgc7gq3n5r3a0lwqfs7awcliks524768c6j"; + rev = "c66642813d1e31a6d133d78ecf964404e15a89fc"; + sha256 = "03qys9038ybc9062w5imdmrs6dlnbp1asggd5czzw7zccvw42db0"; }; meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-03-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "1b9fed5dec33c6c731dc8ff91d337091930474be"; - sha256 = "0bs6j61fjd4ycvhyr54h40v2rj3rymn2s7ncnzbdsczgp3y9wzxi"; + rev = "9d8dae1a780432e2bf6984515a77cc25697e45ae"; + sha256 = "1wygxab1sqinnnh527w1llcv1bb9qydns6w9vvh9bsbag7a9wgs6"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5627,24 +5627,24 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-03-03"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "c22651651da01239fc4afac4cdb7261797d5f02e"; - sha256 = "01zbk00di167npblpf126dqcsyc97k2w72nn88mkkhvhsna28x6x"; + rev = "e2a04d480a9fba6b698c01998582ea17aa213ba3"; + sha256 = "0m4iz32zr3mw8b7mdfqcrvz53xzsrf0dz17xw67knyia85m4h9l5"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2023-01-20"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; - sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; + rev = "be318c83a233cb877ba08faa15380a54241272b1"; + sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5687,12 +5687,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "e172e1e3011e3d032dbeba6414644ba968570828"; - sha256 = "1srbfrjx1zzkkvvd9h9g0hyhrqs4yh6z8znwmzxr9xajg2f7m6kd"; + rev = "09e99259f4cdd929e7fb5487bf9d92426ccf7cc1"; + sha256 = "05py2p82srijkvrr5nc8393v25hdgdgiqmnsy5qiiab82qkyvhhj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -6063,8 +6063,8 @@ final: prev: src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "6336cf91dcd7a3919a57d8cfba582b7651eb9d60"; - sha256 = "0w008x0xsn7rp94kpjnyx06hl730pp7fscj1dnwwgphwr41r41wz"; + rev = "9cce41f5b760ab98bb2c2b0b8a6daf353ec1bb43"; + sha256 = "0wm61s1w25inx9spy8cdif1iwmcdijjiy0j8yiywld3q7ixvdbqq"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6203,12 +6203,12 @@ final: prev: nvim-luadev = buildVimPluginFrom2Nix { pname = "nvim-luadev"; - version = "2022-01-26"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "bfredl"; repo = "nvim-luadev"; - rev = "2a2c242bd751c289cfc1bc27f357925f68eba098"; - sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn"; + rev = "395b7cf3af3e543332c74e883c33eb52364b0b4f"; + sha256 = "0fxx7gn184l00hrskhcsr9dr39r4bwdkn9h5r2g79qp64i0cqmsh"; }; meta.homepage = "https://github.com/bfredl/nvim-luadev/"; }; @@ -6443,36 +6443,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-03-05"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "bbb6d4891009de7dab05ad8fc2d39f272d7a751c"; - sha256 = "1a7wjglszsssm8h31322bz05gfgp86pp4yral9za3gaib2p534v3"; + rev = "fe980baa945100d92f77fe55e2ca113cae1b1bd3"; + sha256 = "12kkn975dj634yix140qjrx4n5dbx6ga50clgbrik74gmq07nj1d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5d59d18d3e6559e525fd933c41070303c5bae32b"; - sha256 = "10ppmv3ijr49g5k05lf1ydkxdi5v38aynm0y2mj89c2p83dps8gv"; + rev = "834f1dcb8736c82b1269227b4bfe830310b5b6a1"; + sha256 = "1gdlypc4qkxh7fghac12562l54hzwlyq74y4p3gsvqzf49m0s9w3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-03-11"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "67dcaf9d913d31a9e87d8deceb7eaecf1c33bb22"; - sha256 = "1q56y6y3kf7by39nfsg1l466yzjwjjbdnrqfjiqrnjv32pm7nfa9"; + rev = "cb6252b00d19c8b57e8e66de19a601df28455dd1"; + sha256 = "06i741381w7hah0mlgg23hrlb57k3qvibgpnncqiw5c17mas01a6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6503,12 +6503,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-03-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "542e0879d524ba717234fcba049b6c2da7989d5a"; - sha256 = "0v5rjjjlfh9rddn4w7g1b5ng5z613gsg650i6yqvpsl2z7bgxdyx"; + rev = "5b2bcb9ca8315879181f468b37a897100d631005"; + sha256 = "0ij8jgvhyqrlw077296dx9ck0agjdd2p5r5fiizsvxrwv0jc6ikj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6551,11 +6551,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-07"; + version = "2023-03-12"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "6bcb1472c321a15eef5a7a015b4fefa8758e6513"; - sha256 = "1shym9028sv5zs2ianyvivm2ij3j013d098yc4vrs0yf5l9vpdy4"; + rev = "7711a873d1f16a9f3049715b63cdd71973108871"; + sha256 = "0kwx3mcs3l56hvr1c0fapfdggfjg25z7nyxvn8v5ch087zfm5kjy"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6574,12 +6574,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-03-07"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "4af94fec29f508159ceab5413383e5dedd6c24e3"; - sha256 = "0v4ajp8s4450qfbbxradka0kbh1k4fdvia9h0r15ah9qrlczfaih"; + rev = "b8d0c99578dcb9d084a45ca4b3a4a502712c2741"; + sha256 = "1mm33s20x4mrxjzxacal2fjxjyqwc3rnbj1f7zvi4ml00wcwiaps"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6670,12 +6670,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-03-07"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "33d5701a8de02bdba171d0795e4422e002f61742"; - sha256 = "1x3x4dmvmjrsay4x0kfz18jkp1aq9cgndgmwnlli1f432hmf3nps"; + rev = "383971b0cfd8248ec3d00d4a3154d69ebd5e394e"; + sha256 = "149lcp5pjyw976r1a83mxfgz75kfnrb5nknqynjqlla191z13ddv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6731,12 +6731,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-03-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "6e9afac9fc4e3c866086c7a73951683959bb04b0"; - sha256 = "0dmnph1lsv5lb79f6wwnhxz41yw499648j53q215vsjaqxql6drv"; + rev = "61cfeceb812ab2c616c3267090e38d0be00d0564"; + sha256 = "0zpb4h4mx1xp0d68cl2ywd1w27ww6p5fh6xr68m9hj58gmpa5saj"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6755,12 +6755,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-03-08"; + version = "2023-03-11"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "c2181be38edea8c8629353163b528ed217f11116"; - sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad"; + rev = "9a59d47db81e566d4e254904479f129cfffe5f21"; + sha256 = "07052ni5kjm5xcc6wl1hvrwayif1srjhlaggawpn8icahhrpn25r"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7417,12 +7417,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-01-20"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; - sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; + rev = "da81fe4573ed3f203fa7aa8db6f125b6a5380390"; + sha256 = "1dgdfwij1w0q2jcvyz56pav1fhzbihpkzgvgcx8hmlxx7p30hmby"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8322,12 +8322,12 @@ final: prev: telescope-manix = buildNeovimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-03-08"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "0f198947a50587119f678635a889d0461ada710b"; - sha256 = "0l4sj1mdvf4q5skzjdwq564px6fsx64bdviwb9lkyn6crh65ffa1"; + rev = "a7cfacda4dc8a56383b30d402ab9eedcffc24c49"; + sha256 = "071fdpxqv0l2zxjy71p0xi8p84jacqfpi9wzv0nm5w5dv8irr304"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8646,12 +8646,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-23"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; - sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; + rev = "6ccb0bebeb22dbe31940776a750db54b844ae653"; + sha256 = "1dmvry7m4rdwrqmb7kaa4zx9mcda8n1yagabyg7nds7jyld671gw"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8683,24 +8683,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-03-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "fd63194901fa80c65f6ff2951b8a975b0c13d9b1"; - sha256 = "0mzhj00d6k4apzq2bl1cajx16pvcin0zpq0mhavlviwb1r37yri7"; + rev = "c8e982ad2739eeb0b13d0fecb14820c9bf5e3da0"; + sha256 = "1cg2qhzfdmw501v8w667n3i7kcl31ci3h71f7ia9p3c5fx85xbww"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-03-08"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "3ebc29df627c5cf70eb6acb8f0843c9ea9cf6348"; - sha256 = "16iq60snxaw6n7gxmcvahahzmb1b3pw07rc9cab597qh3vhhszy9"; + rev = "27203d70747094527d13575ed08f6a714e7a43f8"; + sha256 = "0mrwy3519wb59g42aafnhn8xlpc7yhwdni0q91napcbnjrx8s4r5"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8731,12 +8731,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "19e1150d52ae16bac2465bcd7633c05702b5ae59"; - sha256 = "0d1c0674v26lnwy1q9fg1jsiiyq6lxq49dxmgm3k37z9kw3j61jy"; + rev = "bde69d35d37477dc1997f00cc08047f49aa90f7a"; + sha256 = "0fc7kayzzvz8knmrdd4wsd3vppxkd8dsasp53lm3951xyjb18mlc"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -12730,12 +12730,12 @@ final: prev: vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2022-06-11"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "525f331320427bf7aeb07651e2536b1f8a23df03"; - sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx"; + rev = "074fe09bca0dbe49aea9c5202edba0d1c7ead10c"; + sha256 = "01h3cha6xh6srrkhsk89r7xfh577k5ivrgvnxakgnna95mf94r02"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; @@ -13367,24 +13367,24 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-12-20"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e"; - sha256 = "09vxb458xglzrmxjahxabnqkrkb0cbl6sf9jplp01v0cy3jjfmmw"; + rev = "7753ba9c10429c29d25abfd11b4c60b76718c438"; + sha256 = "1l8myq6c5rckk6jr3s5rx9jpnrgzk1a65yky1b28mvayd6yff4vs"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2022-11-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "1cf89903f12777b90dd79eb4b3d7fbc0b9a254a1"; - sha256 = "00a5kdcdlfnn5f2yv6cavy91f91w0aqckcgpqvchgs631ypjqbp4"; + rev = "1930f0fc234521945afd48db2bff09d925211571"; + sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -13752,12 +13752,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2023-03-10"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "acff8a5b1dd0f9f29797d979819b6e96efa5a656"; - sha256 = "1d39cqn1v2pzqc3znprsq27i79mvvyi1g0qk582965ha17569l0k"; + rev = "34ceee8aaa760d2afc2b220916c8844575fd8d17"; + sha256 = "1gfyi75xxphg6b2cikq3lh353nzyrkw54gflw1pglhcrfxb34y82"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -14113,12 +14113,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-03-09"; + version = "2023-03-13"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "90c4d1c6e1f8dd2cff9962b36a70b1e681947621"; - sha256 = "1y5sp0g2r3x9vmwp45p0rxd0369bvrc5z2f9fk54n278qrg3xi7l"; + rev = "839d015ce9b6c9447fd8b40e43a6411ccc87ebf1"; + sha256 = "1xaq3pamnvxl0fwqxzppjddgmd9453kqqsj1y1mxiqvaphsifxya"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14137,12 +14137,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-03-05"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "1188c4a39167237d551d279c9f84a3e34c7c2329"; - sha256 = "11igiz9l5r7qj6hj1xn5wgzx6a5acgldqq6vjs9w6viwc9cvvin7"; + rev = "62028983c38d849f0b918e02538bd0feb524c5b7"; + sha256 = "11sbp59d1p3a8842b8a8ib7pcfb21y3pfsj5cjy7k5mr156jzr5y"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14233,12 +14233,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-03-09"; + version = "2023-03-12"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "63821c18a2840b3172fc5df15d9268d80f46fa17"; - sha256 = "1m85hwk6y321q7m95s4xd2alby7r3ipgybhf9jrkzjwi3z3yfmmq"; + rev = "1883d8b417403f1d8c56d52d90445bbbe6be4b80"; + sha256 = "1wx9bb4qhd4ap030zrbninfwk409chlr8xsr88zw77pjhc1srzv2"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From 2c3e2ce38307907b6c135fa87890ad8ebae33483 Mon Sep 17 00:00:00 2001 From: "\"Ilan Joselevich\"" <"personal@ilanjoselevich.com"> Date: Mon, 13 Mar 2023 16:40:13 +0200 Subject: [PATCH 106/117] vimPlugins.floating-input-nvim: init at 2023-03-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5a14c1fb81bb..f96c567f252a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3022,6 +3022,18 @@ final: prev: meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; + floating-input-nvim = buildVimPluginFrom2Nix { + pname = "floating-input.nvim"; + version = "2023-03-09"; + src = fetchFromGitHub { + owner = "liangxianzhe"; + repo = "floating-input.nvim"; + rev = "2ac3b4b75de72ea715a04d6d1b8d92c7718d2c64"; + sha256 = "165jk5dhi8lv6fcbfwk395vw5yikmm1v2r74l0nvpa3j6xl1h7zm"; + }; + meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; + }; + floating-nvim = buildVimPluginFrom2Nix { pname = "floating.nvim"; version = "2021-07-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0ee97c75030f..c014614ab798 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -252,6 +252,7 @@ https://github.com/andviro/flake8-vim/,, https://github.com/willothy/flatten.nvim/,HEAD, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, +https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, https://github.com/akinsho/flutter-tools.nvim/,HEAD, From cee6eabdfe36e3ca88444f8db2f2e7adec97d108 Mon Sep 17 00:00:00 2001 From: "\"Ilan Joselevich\"" <"personal@ilanjoselevich.com"> Date: Mon, 13 Mar 2023 16:40:30 +0200 Subject: [PATCH 107/117] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 5bcfeaa12492..b4be9b396f43 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -299,7 +299,6 @@ rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o="; }; - generate = true; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; dhall = buildGrammar { @@ -356,7 +355,7 @@ hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; - meta.homepage = "https://github.com/RubixDev/ebnf.git"; + meta.homepage = "https://github.com/RubixDev/ebnf"; }; eex = buildGrammar { language = "eex"; @@ -576,7 +575,6 @@ rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504"; hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8="; }; - generate = true; meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore"; }; gleam = buildGrammar { @@ -632,7 +630,6 @@ rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik="; }; - generate = true; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"; }; gomod = buildGrammar { @@ -1225,12 +1222,12 @@ }; php = buildGrammar { language = "php"; - version = "f860e59"; + version = "d5e7cac"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "f860e598194f4a71747f91789bf536b393ad4a56"; - hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; + rev = "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3"; + hash = "sha256-cSCHXREt3J6RSpug2EFKWYQNDUqrQeC0vDZ3SrRmLBY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1390,12 +1387,12 @@ }; racket = buildGrammar { language = "racket"; - version = "c2f7baa"; + version = "ed5369a"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "c2f7baa22053a66b4dba852cdba3f14f34bb6985"; - hash = "sha256-P6p2IOECsqCLBgtLE+xqzZuMS8d/lTfAHfTeONClVbY="; + rev = "ed5369ad17166c0749ab7241d826c438bd69338d"; + hash = "sha256-/vvmVirIXH6uAtqEGvG//3XobLFzWCYXIGe4e0N1DsU="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1489,23 +1486,23 @@ }; scala = buildGrammar { language = "scala"; - version = "2275b75"; + version = "6f9bc5a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "2275b754360de8539e02e84106fa38f7cb6de275"; - hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4="; + rev = "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d"; + hash = "sha256-41cRG67Gb9qpaOEVtAtNkjvPurFGgtftHa0MedvJvnU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; - version = "38aef90"; + version = "9a23ff3"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "38aef90f54ef8f2e8e402b1f6f036ed19c636759"; - hash = "sha256-RftYAEUwqlJrOnDs1Cmz5KmJMMBz5h5m7jXpNjWjDYQ="; + rev = "9a23ff3df8f03da555f7679ab640a98a9e851c79"; + hash = "sha256-qEJgMSS6+q3lqks2CzG3XLZrd0Pl3b8jJiD/GA5TBOc="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -1644,12 +1641,12 @@ }; swift = buildGrammar { language = "swift"; - version = "fe2e325"; + version = "449d597"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "fe2e325a45056cdb3fcda821c03b8cef0d79e508"; - hash = "sha256-ldPHpYhuAbodMPY8t8X7UiMY8kcds28r75R3Hqnlqv8="; + rev = "449d5974981d402181ca721e0573346f8c17f726"; + hash = "sha256-P7JEkB9MF9DmxQ/3G2IA2l4pzArzAP1rJQl4MNhu3Bo="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1703,12 +1700,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "e0c3e50"; + version = "d4deb1b"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba"; - hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q="; + rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480"; + hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1758,12 +1755,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "c6e56d4"; + version = "b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "c6e56d44c686a67c89e29e773e662567285d610f"; - hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; + rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"; + hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1792,12 +1789,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "c6e56d4"; + version = "b66d19b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "c6e56d44c686a67c89e29e773e662567285d610f"; - hash = "sha256-usZAbf2sTNO78ldiiex6i94dh73kH6QOV0jjf5StuO0="; + rev = "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"; + hash = "sha256-YJrjxU2VmkVHTHta531fsJrx+K4Xih5kpFVEEqmvz34="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; From 8f16a978482c23bf203ddcca0ce28e564ed3eb79 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Sun, 12 Mar 2023 21:17:07 +0100 Subject: [PATCH 108/117] ocaml: add framePointer option Signed-off-by: Ali Caglayan --- pkgs/development/compilers/ocaml/generic.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index c2cc7bb40b5f..7797ec036d00 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -12,6 +12,7 @@ in , flambdaSupport ? false , spaceTimeSupport ? false , unsafeStringSupport ? false +, framePointerSupport ? false }: assert useX11 -> safeX11 stdenv; @@ -19,6 +20,7 @@ assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12"; assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; +assert framePointerSupport -> lib.versionAtLeast version "4.01"; let src = args.src or (fetchurl { @@ -28,9 +30,14 @@ let in let - useNativeCompilers = !stdenv.isMips; - inherit (lib) optional optionals optionalString; - pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}"; + useNativeCompilers = !stdenv.isMips; + inherit (lib) optional optionals optionalString strings concatStrings; + pname = concatStrings [ "ocaml" + (optionalString aflSupport "+afl") + (optionalString spaceTimeSupport "+spacetime") + (optionalString flambdaSupport "+flambda") + (optionalString framePointerSupport "+fp") + ]; in let @@ -61,6 +68,7 @@ stdenv.mkDerivation (args // { ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") + ++ optional framePointerSupport (flags "--enable-frame-pointers" "-with-frame-pointers") ++ optionals unsafeStringSupport [ "--disable-force-safe-string" "DEFAULT_STRING=unsafe" From c6d79fec060d5649e7bc57bc670bb5bd58f8fff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Mar 2023 05:42:09 +0000 Subject: [PATCH 109/117] liferea: 1.14.0 -> 1.14.1 --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 24500423829f..8a4323acf010 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "uC3ksJ4nNXBjQYqNOS4qK6aCK6/Wzf27YXHbM73TpdU="; + sha256 = "5g74oN+NiKm/hnBLZvDxnAcBuP6B4y1Nsvb6nShZBnw="; }; nativeBuildInputs = [ From f9337c309545c3c4661b32c55c5730c12ba7246a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Thu, 9 Mar 2023 23:53:30 +0100 Subject: [PATCH 110/117] wasm-tools: init at 1.0.27 --- pkgs/tools/misc/wasm-tools/Cargo.lock | 2162 ++++++++++++++++++++++++ pkgs/tools/misc/wasm-tools/default.nix | 33 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 2197 insertions(+) create mode 100644 pkgs/tools/misc/wasm-tools/Cargo.lock create mode 100644 pkgs/tools/misc/wasm-tools/default.nix diff --git a/pkgs/tools/misc/wasm-tools/Cargo.lock b/pkgs/tools/misc/wasm-tools/Cargo.lock new file mode 100644 index 000000000000..07b7895a6a38 --- /dev/null +++ b/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -0,0 +1,2162 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "clap" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + +[[package]] +name = "cpp_demangle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cpp_demangle" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cranelift-bforest" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62c772976416112fa4484cbd688cb6fb35fd430005c1c586224fc014018abad" +dependencies = [ + "cranelift-entity", +] + +[[package]] +name = "cranelift-codegen" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b40ed2dd13c2ac7e24f88a3090c68ad3414eb1d066a95f8f1f7b3b819cb4e46" +dependencies = [ + "arrayvec", + "bumpalo", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-egraph", + "cranelift-entity", + "cranelift-isle", + "gimli", + "log", + "regalloc2", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-codegen-meta" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb927a8f1c27c34ee3759b6b0ffa528d2330405d5cc4511f0cab33fe2279f4b5" +dependencies = [ + "cranelift-codegen-shared", +] + +[[package]] +name = "cranelift-codegen-shared" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dfa417b884a9ab488d95fd6b93b25e959321fe7bfd7a0a960ba5d7fb7ab927" + +[[package]] +name = "cranelift-egraph" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce" +dependencies = [ + "cranelift-entity", + "fxhash", + "hashbrown", + "indexmap", + "log", + "smallvec", +] + +[[package]] +name = "cranelift-entity" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0637ffde963cb5d759bc4d454cfa364b6509e6c74cdaa21298add0ed9276f346" +dependencies = [ + "serde", +] + +[[package]] +name = "cranelift-frontend" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb72b8342685e850cb037350418f62cc4fc55d6c2eb9c7ca01b82f9f1a6f3d56" +dependencies = [ + "cranelift-codegen", + "log", + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cranelift-isle" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850579cb9e4b448f7c301f1e6e6cbad99abe3f1f1d878a4994cb66e33c6db8cd" + +[[package]] +name = "cranelift-native" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a279e5bcba3e0466c734d8d8eb6bfc1ad29e95c37f3e4955b492b5616335e" +dependencies = [ + "cranelift-codegen", + "libc", + "target-lexicon", +] + +[[package]] +name = "cranelift-wasm" +version = "0.90.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b8c5e7ffb754093fb89ec4bd4f9dbb9f1c955427299e334917d284745835c2" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "itertools", + "log", + "smallvec", + "wasmparser 0.93.0", + "wasmtime-types", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.8.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "derive_arbitrary" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "egg" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05a6c0bbc92278f84e742f08c0ab9cb16a987376cd2bc39d228ef9c74d98d6f7" +dependencies = [ + "indexmap", + "instant", + "log", + "once_cell", + "smallvec", + "symbolic_expressions", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flagset" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" +dependencies = [ + "serde", +] + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fuzz-stats" +version = "0.1.0" +dependencies = [ + "anyhow", + "arbitrary", + "num_cpus", + "rand", + "wasm-smith", + "wasmtime", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes 1.0.6", + "rustix 0.36.9", + "windows-sys 0.45.0", +] + +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "crc32fast", + "hashbrown", + "indexmap", + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "pulldown-cmark" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regalloc2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +dependencies = [ + "fxhash", + "log", + "slice-group-by", + "smallvec", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustix" +version = "0.35.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.6", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "symbolic_expressions" +version = "5.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.36.9", + "windows-sys 0.42.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-compose" +version = "0.2.10" +dependencies = [ + "anyhow", + "clap 4.1.8", + "glob", + "heck", + "indexmap", + "log", + "petgraph", + "pretty_assertions", + "serde", + "serde_yaml", + "smallvec", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-encoder" +version = "0.25.0" +dependencies = [ + "anyhow", + "leb128", + "tempfile", + "wasmparser 0.102.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.3.1" +dependencies = [ + "anyhow", + "clap 4.1.8", + "indexmap", + "serde", + "wasm-encoder", + "wasmparser 0.102.0", + "wat", +] + +[[package]] +name = "wasm-mutate" +version = "0.2.21" +dependencies = [ + "anyhow", + "clap 4.1.8", + "egg", + "env_logger", + "log", + "rand", + "thiserror", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-mutate-stats" +version = "0.1.0" +dependencies = [ + "anyhow", + "arbitrary", + "clap 4.1.8", + "env_logger", + "itertools", + "log", + "num_cpus", + "rand", + "wasm-mutate", + "wasmparser 0.102.0", + "wasmprinter", + "wasmtime", +] + +[[package]] +name = "wasm-shrink" +version = "0.1.22" +dependencies = [ + "anyhow", + "blake3", + "clap 4.1.8", + "env_logger", + "log", + "rand", + "wasm-mutate", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-smith" +version = "0.12.5" +dependencies = [ + "arbitrary", + "criterion", + "flagset", + "indexmap", + "leb128", + "libfuzzer-sys", + "rand", + "serde", + "wasm-encoder", + "wasmparser 0.102.0", + "wasmprinter", + "wat", +] + +[[package]] +name = "wasm-tools" +version = "1.0.27" +dependencies = [ + "anyhow", + "arbitrary", + "atty", + "clap 4.1.8", + "cpp_demangle 0.4.0", + "diff", + "env_logger", + "is_executable", + "log", + "pretty_assertions", + "rayon", + "regex", + "rustc-demangle", + "serde", + "serde_json", + "tempfile", + "wasm-compose", + "wasm-encoder", + "wasm-metadata", + "wasm-mutate", + "wasm-shrink", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wast", + "wat", + "wit-component", + "wit-parser", +] + +[[package]] +name = "wasm-tools-c-api" +version = "0.1.1" +dependencies = [ + "arbitrary", + "wasm-mutate", + "wasm-shrink", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wast", + "wat", +] + +[[package]] +name = "wasm-tools-fuzz" +version = "0.0.1" +dependencies = [ + "anyhow", + "arbitrary", + "env_logger", + "libfuzzer-sys", + "log", + "tempfile", + "wasm-encoder", + "wasm-mutate", + "wasm-smith", + "wasmparser 0.102.0", + "wasmprinter", + "wasmtime", + "wast", + "wat", + "wit-component", + "wit-parser", +] + +[[package]] +name = "wasmparser" +version = "0.93.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328" +dependencies = [ + "indexmap", +] + +[[package]] +name = "wasmparser" +version = "0.102.0" +dependencies = [ + "anyhow", + "criterion", + "indexmap", + "once_cell", + "rayon", + "url", + "wasm-encoder", + "wast", + "wat", +] + +[[package]] +name = "wasmprinter" +version = "0.2.53" +dependencies = [ + "anyhow", + "diff", + "rayon", + "tempfile", + "wasmparser 0.102.0", + "wast", + "wat", +] + +[[package]] +name = "wasmtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18265705b1c49218776577d9f301d79ab06888c7f4a32e2ed24e68a55738ce7" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "indexmap", + "libc", + "log", + "object", + "once_cell", + "paste", + "psm", + "serde", + "target-lexicon", + "wasmparser 0.93.0", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a201583f6c79b96e74dcce748fa44fb2958f474ef13c93f880ea4d3bed31ae4f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "wasmtime-cranelift" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe208297e045ea0ee6702be88772ea40f918d55fbd4163981a4699aff034b634" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", + "gimli", + "log", + "object", + "target-lexicon", + "thiserror", + "wasmparser 0.93.0", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-environ" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b97f7441ac780a7fa738db5b9c23c1b70ef4abccd8ad205ada5669d196ba2" +dependencies = [ + "anyhow", + "cranelift-entity", + "gimli", + "indexmap", + "log", + "object", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.93.0", + "wasmtime-types", +] + +[[package]] +name = "wasmtime-jit" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32800cb6e29faabab7056593f70a4c00c65c75c365aaf05406933f2169d0c22f" +dependencies = [ + "addr2line", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle 0.3.5", + "gimli", + "log", + "object", + "rustc-demangle", + "serde", + "target-lexicon", + "thiserror", + "wasmtime-environ", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe057012a0ba6cee3685af1e923d6e0a6cb9baf15fb3ffa4be3d7f712c7dec42" +dependencies = [ + "once_cell", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6bbabb309c06cc238ee91b1455b748c45f0bdcab0dda2c2db85b0a1e69fcb66" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-runtime" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a23b6e138e89594c0189162e524a29e217aec8f9a4e1959a34f74c64e8d17d" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memoffset 0.6.5", + "paste", + "rand", + "rustix 0.35.13", + "thiserror", + "wasmtime-asm-macros", + "wasmtime-environ", + "wasmtime-jit-debug", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-types" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ec7615fde8c79737f1345d81f0b18da83b3db929a87b4604f27c932246d1e2" +dependencies = [ + "cranelift-entity", + "serde", + "thiserror", + "wasmparser 0.93.0", +] + +[[package]] +name = "wast" +version = "55.0.0" +dependencies = [ + "anyhow", + "leb128", + "memchr", + "rayon", + "unicode-width", + "wasm-encoder", + "wasmparser 0.102.0", + "wat", +] + +[[package]] +name = "wat" +version = "1.0.61" +dependencies = [ + "wast", +] + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "wit-component" +version = "0.7.3" +dependencies = [ + "anyhow", + "bitflags", + "env_logger", + "glob", + "indexmap", + "log", + "pretty_assertions", + "url", + "wasm-encoder", + "wasm-metadata", + "wasmparser 0.102.0", + "wasmprinter", + "wat", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.6.4" +dependencies = [ + "anyhow", + "env_logger", + "id-arena", + "indexmap", + "log", + "pretty_assertions", + "pulldown-cmark", + "rayon", + "unicode-xid", + "url", +] + +[[package]] +name = "wit-parser-fuzz" +version = "0.0.1" +dependencies = [ + "arbitrary", + "env_logger", + "libfuzzer-sys", + "log", + "wasmprinter", + "wit-parser", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix new file mode 100644 index 000000000000..302f3e99c2e1 --- /dev/null +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "wasm-tools"; + version = "1.0.27"; + + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-kuTcxZLtQyDcj8SFfpJRNwto1e5iuXjxqZ46CnLOVIc="; + fetchSubmodules = true; + }; + + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ "--package" "wasm-tools" ]; + + cargoTestFlags = [ "--all" ]; + + meta = with lib; { + description = "Low level tooling for WebAssembly in Rust"; + homepage = "https://github.com/bytecodealliance/wasm-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ ereslibre ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0f3710d68d3..b8b60d6e0e7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13302,6 +13302,8 @@ with pkgs; nodejs = nodejs_latest; }; + wasm-tools = callPackage ../tools/misc/wasm-tools { }; + wasmedge = callPackage ../development/tools/wasmedge { llvmPackages = llvmPackages_12; inherit (darwin.apple_sdk.frameworks) Foundation; From f7986da98e75b21600611b8785cc34d411031cad Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 13 Mar 2023 17:02:53 +0800 Subject: [PATCH 111/117] neovim-gtk: init at 1.0.4 --- .../editors/neovim/neovim-gtk.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100755 pkgs/applications/editors/neovim/neovim-gtk.nix diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix new file mode 100755 index 000000000000..eebb980f85cb --- /dev/null +++ b/pkgs/applications/editors/neovim/neovim-gtk.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, wrapGAppsHook4 +, pkg-config +, gdk-pixbuf +, gtk4 +, pango +, vte-gtk4 +}: + +rustPlatform.buildRustPackage rec { + pname = "neovim-gtk"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "Lyude"; + repo = pname; + rev = "v${version}"; + hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; + }; + + cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; + + nativeBuildInputs = [ wrapGAppsHook4 pkg-config ]; + + buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; + + postInstall = '' + make PREFIX=$out install-resources + ''; + + meta = with lib; { + description = "Gtk ui for neovim"; + homepage = "https://github.com/Lyude/neovim-gtk"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "nvim-gtk"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac2d1d0abdd..f76ff6124fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34018,6 +34018,8 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; + neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; + neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; From 4963a56675004d194bacf9141ace700c09ad7a24 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Tue, 14 Feb 2023 18:50:57 +0100 Subject: [PATCH 112/117] nimPackages.x11: init at unstable-2021-01-07 --- pkgs/development/nim-packages/x11/default.nix | 22 +++++++++++++++++++ pkgs/top-level/nim-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/nim-packages/x11/default.nix diff --git a/pkgs/development/nim-packages/x11/default.nix b/pkgs/development/nim-packages/x11/default.nix new file mode 100644 index 000000000000..abfac2e4b837 --- /dev/null +++ b/pkgs/development/nim-packages/x11/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "x11"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "nim-lang"; + repo = pname; + rev = "2093a4c01360cbb5dd33ab79fd4056e148b53ca1"; + hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "X11 library for nim"; + license = [ licenses.mit ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index ecc5a9e0bb7e..783e1f7d7a98 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -114,6 +114,8 @@ lib.makeScope newScope (self: vmath = callPackage ../development/nim-packages/vmath { }; + x11 = callPackage ../development/nim-packages/x11 { }; + zippy = callPackage ../development/nim-packages/zippy { }; }) From ace332cd9cfcaf9520b76f371302a99e3e42e4cb Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 11 Mar 2023 18:01:36 +0100 Subject: [PATCH 113/117] nimdow: init at 0.7.36 --- .../window-managers/nimdow/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/window-managers/nimdow/default.nix diff --git a/pkgs/applications/window-managers/nimdow/default.nix b/pkgs/applications/window-managers/nimdow/default.nix new file mode 100644 index 000000000000..0887a9b33dc1 --- /dev/null +++ b/pkgs/applications/window-managers/nimdow/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, nimPackages, libX11, libXft, libXinerama }: +nimPackages.buildNimPackage rec { + pname = "nimdow"; + version = "0.7.36"; + + + src = fetchFromGitHub { + owner = "avahe-kellenberger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+36wxKgboOd3HvGnD555WySzJWGL39DaFXmIaFYtSN8="; + }; + + + buildInputs = with nimPackages; [ parsetoml x11 safeset libX11 libXft libXinerama ]; + + postInstall = '' + install -D config.default.toml $out/share/nimdow/config.default.toml + install -D nimdow.desktop $out/share/applications/nimdow.desktop + ''; + + postPatch = '' + substituteInPlace src/nimdowpkg/config/configloader.nim --replace "/usr/share/nimdow" "$out/share/nimdow" + ''; + + + + doCheck = true; + + meta = with lib; + src.meta // { + description = "Nim based tiling window manager"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96a143e0eaa0..39a1a0ec8d1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32271,6 +32271,8 @@ with pkgs; stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; + nimdow = callPackage ../applications/window-managers/nimdow { }; + nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; From f4c41cbebbd3175c43b3b03d4bcd556efccc5a4c Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 11 Mar 2023 18:10:51 +0100 Subject: [PATCH 114/117] add marcusramberg as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9bb991ba8e92..c0453d33ee25 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9191,6 +9191,12 @@ githubId = 50230945; name = "Marcus Boyd"; }; + marcusramberg = { + email = "marcus@means.no"; + github = "marcusramberg"; + githubId = 5526; + name = "Marcus Ramberg"; + }; marenz = { email = "marenz@arkom.men"; github = "marenz2569"; From 1436ad0bacf2e8ce4b4ad5d31d906f8f5aa36daf Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 11 Mar 2023 18:43:22 +0100 Subject: [PATCH 115/117] nimPackages.safeset: init at 0.1.1 --- .../nim-packages/safeset/default.nix | 22 +++++++++++++++++++ pkgs/top-level/nim-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/nim-packages/safeset/default.nix diff --git a/pkgs/development/nim-packages/safeset/default.nix b/pkgs/development/nim-packages/safeset/default.nix new file mode 100644 index 000000000000..df613143e9a8 --- /dev/null +++ b/pkgs/development/nim-packages/safeset/default.nix @@ -0,0 +1,22 @@ +{ lib, buildNimPackage, fetchFromGitHub }: +buildNimPackage rec { + pname = "safeset"; + + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "avahe-kellenberger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU="; + }; + + doCheck = true; + + meta = with lib; + src.meta // { + description = "safeset library for nim"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 783e1f7d7a98..cfa4345ff236 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -83,6 +83,8 @@ lib.makeScope newScope (self: inherit (pkgs) rocksdb; }; + safeset = callPackage ../development/nim-packages/safeset { }; + sass = callPackage ../development/nim-packages/sass { }; sdl2 = callPackage ../development/nim-packages/sdl2 { }; From f834dfad8f6c63e643da252ca43a7d15775d3734 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sun, 12 Mar 2023 13:49:52 +0100 Subject: [PATCH 116/117] nimdow: Add nixos windowmanager option --- .../manual/release-notes/rl-2305.section.md | 2 ++ nixos/modules/module-list.nix | 1 + .../services/x11/window-managers/nimdow.nix | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/nimdow.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 996dcea58adb..f95c01823792 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -69,6 +69,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable). +- [nimdow](https://github.com/avahe-kellenberger/nimdow), a window manager written in Nim, inspired by dwm. + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 69fb14a1fef4..60f3bbc98c0c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1273,6 +1273,7 @@ ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/katriawm.nix ./services/x11/window-managers/metacity.nix + ./services/x11/window-managers/nimdow.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix ./services/x11/window-managers/windowlab.nix diff --git a/nixos/modules/services/x11/window-managers/nimdow.nix b/nixos/modules/services/x11/window-managers/nimdow.nix new file mode 100644 index 000000000000..de3192876024 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/nimdow.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.nimdow; +in +{ + options = { + services.xserver.windowManager.nimdow.enable = mkEnableOption (lib.mdDoc "nimdow"); + }; + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "nimdow"; + start = '' + ${pkgs.nimdow}/bin/nimdow & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.nimdow ]; + }; +} From c79b98dd409766c342cb4917ed23f2c56b80f38d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Mar 2023 10:11:53 +0000 Subject: [PATCH 117/117] coldsnap: 0.4.3 -> 0.5.0 --- pkgs/tools/admin/coldsnap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index 6ff4f443982d..75fd7b7803a5 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "coldsnap"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-kL9u+IBlC9Pxm5yaJagY9dy0Pm0xlKfVxFVBmwDMSak="; + hash = "sha256-M3TzzaOTbe0VbAd2HSUC/S5Sfuanv8Ad17C6vBNb2og="; }; - cargoHash = "sha256-eYBmke0FQ9CK3cCaM7ecmp1vkNlZO3SHRnxFzmelYhU="; + cargoHash = "sha256-N6066QMGA2XAQ7xr6d34Ts7lVcnRC0uFo0/xpPceNcQ="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ];