From 690e76e0632ae237432ec86823094e350fa96f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Mar 2023 18:48:24 -0800 Subject: [PATCH 01/62] gotop: fix build on Darwin It failed with error: 'TARGET_OS_MAC' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] --- pkgs/tools/system/gotop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 93cf8ea6b5ae..5411bc94609f 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -27,6 +27,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; + # prevent `error: 'TARGET_OS_MAC' is not defined` + env.CGO_CFLAGS = "-Wno-undef-prefix"; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; From ab3044b4536b70bda8686649bc300c42f25517b7 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 7 Feb 2023 12:17:48 +0100 Subject: [PATCH 02/62] libgcrypt: 1.5.6 -> 1.8.10 --- pkgs/development/libraries/libgcrypt/1.5.nix | 53 -------------- pkgs/development/libraries/libgcrypt/1.8.nix | 75 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 76 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/libraries/libgcrypt/1.5.nix create mode 100644 pkgs/development/libraries/libgcrypt/1.8.nix diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix deleted file mode 100644 index 918ed20efaaf..000000000000 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, libgpg-error, enableCapabilities ? false, libcap }: - -assert enableCapabilities -> stdenv.isLinux; - -stdenv.mkDerivation rec { - pname = "libgcrypt"; - version = "1.5.6"; - - src = fetchurl { - url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2"; - sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; - }; - - patches = lib.optionals stdenv.isDarwin [ - (fetchpatch { - name = "fix-x86_64-apple-darwin.patch"; - sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=71939faa7c54e7b4b28d115e748a85f134876a02"; - }) - ]; - - buildInputs = - [ libgpg-error ] - ++ lib.optional enableCapabilities libcap; - - # Make sure libraries are correct for .pc and .la files - # Also make sure includes are fixed for callers who don't use libgpgcrypt-config - postInstall = '' - sed -i 's,#include ,#include "${libgpg-error.dev}/include/gpg-error.h",g' $out/include/gcrypt.h - '' + lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la - ''; - - doCheck = true; - - meta = with lib; { - homepage = "https://www.gnu.org/software/libgcrypt/"; - description = "General-pupose cryptographic library"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - knownVulnerabilities = [ - "CVE-2014-3591" - "CVE-2015-0837" - "CVE-2015-7511" - "CVE-2017-0379" - "CVE-2017-7526" - "CVE-2017-9526" - "CVE-2018-0495" - "CVE-2018-6829" - "CVE-2018-12437" - ]; - }; -} diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix new file mode 100644 index 000000000000..cce79780f1cb --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/1.8.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, libgpg-error +, enableCapabilities ? false, libcap +, buildPackages +# for passthru.tests +, gnupg +, libotr +, rsyslog +}: + +assert enableCapabilities -> stdenv.isLinux; + +stdenv.mkDerivation rec { + pname = "libgcrypt"; + version = "1.8.10"; + + src = fetchurl { + url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2"; + sha256 = "sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590="; + }; + + outputs = [ "out" "dev" "info" ]; + outputBin = "dev"; + + # The CPU Jitter random number generator must not be compiled with + # optimizations and the optimize -O0 pragma only works for gcc. + # The build enables -O2 by default for everything else. + hardeningDisable = lib.optional stdenv.cc.isClang "fortify"; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + buildInputs = [ libgpg-error ] + ++ lib.optional enableCapabilities libcap; + + strictDeps = true; + + configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ] + ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 + + # Necessary to generate correct assembly when compiling for aarch32 on + # aarch64 + configurePlatforms = [ "host" "build" ]; + + postConfigure = '' + sed -i configure \ + -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' + ''; + + # Make sure libraries are correct for .pc and .la files + # Also make sure includes are fixed for callers who don't use libgpgcrypt-config + postFixup = '' + sed -i 's,#include ,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" + '' + lib.optionalString enableCapabilities '' + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la + ''; + + doCheck = true; + + passthru.tests = { + inherit gnupg libotr rsyslog; + }; + + meta = with lib; { + homepage = "https://www.gnu.org/software/libgcrypt/"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; + description = "General-purpose cryptographic library"; + license = licenses.lgpl2Plus; + platforms = platforms.all; + knownVulnerabilities = [ + "CVE-2018-12437" # CVE is about LibTomCrypt + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b98217a2e6c3..29b5cd8e478d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21467,7 +21467,7 @@ with pkgs; libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; + libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { }; libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; From 858391dfad508a2f1b80e571802c40813baa285f Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 7 Feb 2023 12:18:33 +0100 Subject: [PATCH 03/62] gnupg: Add LTS version 2.2.41 --- ...eviously-known-keys-even-without-UI.patch} | 26 ++-- pkgs/tools/security/gnupg/22.nix | 115 ++++++++++++++++++ ...reviously-known-keys-even-without-UI.patch | 107 ++++++++++++++++ pkgs/tools/security/gnupg/24.nix | 54 +++++--- pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 276 insertions(+), 33 deletions(-) rename pkgs/tools/security/gnupg/{allow-import-of-previously-known-keys-even-without-UI.patch => 22-allow-import-of-previously-known-keys-even-without-UI.patch} (82%) create mode 100644 pkgs/tools/security/gnupg/22.nix create mode 100644 pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch diff --git a/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch similarity index 82% rename from pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch rename to pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch index 98dda54fc7fa..e8fbe1688402 100644 --- a/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch +++ b/pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch @@ -16,11 +16,12 @@ Signed-off-by: Daniel Kahn Gillmor g10/import.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) + diff --git a/g10/import.c b/g10/import.c -index 5d3162c..f9acf95 100644 +index cd3363fc7..8f10771db 100644 --- a/g10/import.c +++ b/g10/import.c -@@ -1788,7 +1788,6 @@ import_one_real (ctrl_t ctrl, +@@ -1858,7 +1858,6 @@ import_one_real (ctrl_t ctrl, size_t an; char pkstrbuf[PUBKEY_STRING_SIZE]; int merge_keys_done = 0; @@ -28,12 +29,11 @@ index 5d3162c..f9acf95 100644 KEYDB_HANDLE hd = NULL; if (r_valid) -@@ -1825,14 +1824,6 @@ import_one_real (ctrl_t ctrl, - log_printf ("\n"); +@@ -1896,13 +1895,6 @@ import_one_real (ctrl_t ctrl, } -- -- if (!uidnode) + +- if (!uidnode ) - { - if (!silent) - log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); @@ -43,17 +43,17 @@ index 5d3162c..f9acf95 100644 if (screener && screener (keyblock, screener_arg)) { log_error (_("key %s: %s\n"), keystr_from_pk (pk), -@@ -1907,18 +1898,10 @@ import_one_real (ctrl_t ctrl, +@@ -1977,18 +1969,10 @@ import_one_real (ctrl_t ctrl, } } - /* Delete invalid parts and bail out if there are no user ids left. */ -- if (!delete_inv_parts (ctrl, keyblock, keyid, options)) +- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs)) - { - if (!silent) - { -- log_error ( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); -- if (!opt.quiet) +- log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); +- if (!opt.quiet ) - log_info(_("this may be caused by a missing self-signature\n")); - } - stats->no_user_id++; @@ -62,11 +62,11 @@ index 5d3162c..f9acf95 100644 + /* Delete invalid parts, and note if we have any valid ones left. + * We will later abort import if this key is new but contains + * no valid uids. */ -+ delete_inv_parts (ctrl, keyblock, keyid, options); ++ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs); /* Get rid of deleted nodes. */ commit_kbnode (&keyblock); -@@ -1927,24 +1911,11 @@ import_one_real (ctrl_t ctrl, +@@ -1998,24 +1982,11 @@ import_one_real (ctrl_t ctrl, { apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); commit_kbnode (&keyblock); @@ -91,7 +91,7 @@ index 5d3162c..f9acf95 100644 } /* The keyblock is valid and ready for real import. */ -@@ -2002,6 +1973,13 @@ import_one_real (ctrl_t ctrl, +@@ -2073,6 +2044,13 @@ import_one_real (ctrl_t ctrl, err = 0; stats->skipped_new_keys++; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix new file mode 100644 index 000000000000..3a4309075b76 --- /dev/null +++ b/pkgs/tools/security/gnupg/22.nix @@ -0,0 +1,115 @@ +{ lib, stdenv, fetchurl, buildPackages +, pkg-config, texinfo +, gettext, libassuan, libgcrypt, libgpg-error, libiconv, libksba, npth +, adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib +, enableMinimal ? false +, withPcsc ? !enableMinimal, pcsclite +, guiSupport ? stdenv.isDarwin, pinentry +}: + +with lib; + +let + pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; +in + +assert guiSupport -> enableMinimal == false; + +stdenv.mkDerivation rec { + pname = "gnupg"; + version = "2.2.41"; + + src = fetchurl { + url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; + hash = "sha256-E/MpEAel6FRvy3vAxmEM5EqqmzmVBZ1PgUW6Cf1b4+E="; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkg-config texinfo ]; + buildInputs = [ + gettext libassuan libgcrypt libgpg-error libiconv libksba npth + ] ++ lib.optionals (!enableMinimal) [ + adns bzip2 gnutls libusb1 openldap readline sqlite zlib + ]; + + patches = [ + ./fix-libusb-include-path.patch + ./tests-add-test-cases-for-import-without-uid.patch + ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch + + # The following patch has no effect as the code is + # "[d]isabled for 2.2.19 to due problems with the standard hkps pool." + #./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch + + ./22-allow-import-of-previously-known-keys-even-without-UI.patch + ]; + + postPatch = '' + sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 + # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in + '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; + + configureFlags = [ + "--with-libgpg-error-prefix=${libgpg-error.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "--with-npth-prefix=${npth}" + ] + ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" + ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + + postInstall = if enableMinimal + then '' + rm -r $out/{libexec,sbin,share} + for f in $(find $out/bin -type f -not -name gpg) + do + rm $f + done + '' else '' + mkdir -p $out/lib/systemd/user + for f in doc/examples/systemd-user/*.{service,socket} ; do + substitute $f $out/lib/systemd/user/$(basename $f) \ + --replace /usr/bin $out/bin + done + + # add gpg2 symlink to make sure git does not break when signing commits + ln -s $out/bin/gpg $out/bin/gpg2 + + # Make libexec tools available in PATH + for f in $out/libexec/; do + if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi + ln -s $f $out/bin/$(basename $f) + done + + ln -s -t $out/bin $out/libexec/* + ''; + + enableParallelBuilding = true; + + passthru.tests.connman = nixosTests.gnupg; + + meta = with lib; { + homepage = "https://gnupg.org"; + description = "LTS release of the GNU Privacy Guard, a GPL OpenPGP implementation"; + license = licenses.gpl3Plus; + longDescription = '' + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "modern" (2.1) is the latest development with a lot of new features. + GnuPG allows to encrypt and sign your data and communication, features a + versatile key management system as well as access modules for all kind of + public key directories. GnuPG, also known as GPG, is a command line tool + with features for easy integration with other applications. A wealth of + frontend applications and libraries are available. Version 2 of GnuPG + also provides support for S/MIME. + ''; + maintainers = with maintainers; [ fpletz vrthra ]; + platforms = platforms.all; + mainProgram = "gpg"; + }; +} diff --git a/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch new file mode 100644 index 000000000000..8d4f703a3dd1 --- /dev/null +++ b/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch @@ -0,0 +1,107 @@ +From: Vincent Breitmoser +Date: Thu, 13 Jun 2019 21:27:42 +0200 +Subject: gpg: allow import of previously known keys, even without UIDs + +* g10/import.c (import_one): Accept an incoming OpenPGP certificate that +has no user id, as long as we already have a local variant of the cert +that matches the primary key. + +-- + +This fixes two of the three broken tests in import-incomplete.scm. + +GnuPG-Bug-id: 4393 +Signed-off-by: Daniel Kahn Gillmor +--- + g10/import.c | 44 +++++++++++--------------------------------- + 1 file changed, 11 insertions(+), 33 deletions(-) + + +diff --git a/g10/import.c b/g10/import.c +index 9fab46ca6..61896a6bf 100644 +--- a/g10/import.c ++++ b/g10/import.c +@@ -1954,7 +1954,6 @@ import_one_real (ctrl_t ctrl, + size_t an; + char pkstrbuf[PUBKEY_STRING_SIZE]; + int merge_keys_done = 0; +- int any_filter = 0; + KEYDB_HANDLE hd = NULL; + + if (r_valid) +@@ -1992,13 +1991,6 @@ import_one_real (ctrl_t ctrl, + } + + +- if (!uidnode) +- { +- if (!silent) +- log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); +- return 0; +- } +- + if (screener && screener (keyblock, screener_arg)) + { + log_error (_("key %s: %s\n"), keystr_from_pk (pk), +@@ -2078,18 +2070,10 @@ import_one_real (ctrl_t ctrl, + } + } + +- /* Delete invalid parts and bail out if there are no user ids left. */ +- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs)) +- { +- if (!silent) +- { +- log_error ( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); +- if (!opt.quiet) +- log_info(_("this may be caused by a missing self-signature\n")); +- } +- stats->no_user_id++; +- return 0; +- } ++ /* Delete invalid parts, and note if we have any valid ones left. ++ * We will later abort import if this key is new but contains ++ * no valid uids. */ ++ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs); + + /* Get rid of deleted nodes. */ + commit_kbnode (&keyblock); +@@ -2099,24 +2083,11 @@ import_one_real (ctrl_t ctrl, + { + apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); + commit_kbnode (&keyblock); +- any_filter = 1; + } + if (import_filter.drop_sig) + { + apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig); + commit_kbnode (&keyblock); +- any_filter = 1; +- } +- +- /* If we ran any filter we need to check that at least one user id +- * is left in the keyring. Note that we do not use log_error in +- * this case. */ +- if (any_filter && !any_uid_left (keyblock)) +- { +- if (!opt.quiet ) +- log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk)); +- stats->no_user_id++; +- return 0; + } + + /* The keyblock is valid and ready for real import. */ +@@ -2174,6 +2145,13 @@ import_one_real (ctrl_t ctrl, + err = 0; + stats->skipped_new_keys++; + } ++ else if (err && !any_uid_left (keyblock)) ++ { ++ if (!silent) ++ log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid)); ++ err = 0; ++ stats->no_user_id++; ++ } + else if (err) /* Insert this key. */ + { + /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY. */ diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index c1f2825e8e93..0334964c473a 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -1,13 +1,19 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba -, libgpg-error, libiconv, npth, gettext, texinfo, buildPackages -, nixosTests -, guiSupport ? stdenv.isDarwin, enableMinimal ? false -, adns, bzip2, gnutls, libusb1, openldap -, pinentry, readline, sqlite, zlib +{ lib, stdenv, fetchurl, buildPackages +, pkg-config, texinfo +, gettext, libassuan, libgcrypt, libgpg-error, libiconv, libksba, npth +, adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib +, enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite +, guiSupport ? stdenv.isDarwin, pinentry , withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss }: +with lib; + +let + pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; +in + assert guiSupport -> enableMinimal == false; stdenv.mkDerivation rec { @@ -16,44 +22,49 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; + hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ - libgcrypt libassuan libksba libiconv npth gettext - ] ++ lib.optionals (!enableMinimal) ([ - readline libusb1 gnutls adns openldap zlib bzip2 sqlite - ] ++ lib.optional withTpm2Tss tpm2-tss); + gettext libassuan libgcrypt libgpg-error libiconv libksba npth + ] ++ lib.optionals (!enableMinimal) [ + adns bzip2 gnutls libusb1 openldap readline sqlite zlib + ] ++ lib.optionals withTpm2Tss [ tpm2-tss ]; patches = [ ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch - # TODO: Refresh patch? Doesn't apply on 2.4.0 - #./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch + # The following patch has no effect as the code is + # "[d]isabled for 2.3.2 to due problems with the standard hkps pool." + #./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch + + ./24-allow-import-of-previously-known-keys-even-without-UI.patch + # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch - ]; + postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' - sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; - pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-libassuan-prefix=${libassuan.dev}" "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" - ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" + ] + ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" ++ lib.optional withTpm2Tss "--with-tss=intel" ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; + postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share} @@ -76,6 +87,11 @@ stdenv.mkDerivation rec { if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi ln -s $f $out/bin/$(basename $f) done + + for f in $out/libexec/; do + if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi + ln -s $f $out/bin/$(basename $f) + done ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29b5cd8e478d..a8621041d08d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7902,8 +7902,13 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + + gnupg22 = callPackage ../tools/security/gnupg/22.nix { + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + libgcrypt = libgcrypt_1_8; + }; + gnupg24 = callPackage ../tools/security/gnupg/24.nix { - guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; From 530ebd6c0ddca9f228e1322d88957e392e6eae77 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 22 Mar 2023 12:08:24 +0100 Subject: [PATCH 04/62] gnupg: Remove patch for code that is disabled upstream --- ...gr-Only-use-SKS-pool-CA-for-SKS-pool.patch | 34 ------------------- pkgs/tools/security/gnupg/22.nix | 5 --- pkgs/tools/security/gnupg/24.nix | 6 ---- 3 files changed, 45 deletions(-) delete mode 100644 pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch diff --git a/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch b/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch deleted file mode 100644 index 061fb0e8de9c..000000000000 --- a/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254 Mon Sep 17 00:00:00 2001 -From: Daniel Kahn Gillmor -Date: Sun, 30 Jun 2019 11:54:35 -0400 -Subject: [PATCH] dirmngr: Only use SKS pool CA for SKS pool - -* dirmngr/http.c (http_session_new): when checking whether the -keyserver is the HKPS pool, check specifically against the pool name, -as ./configure might have been used to select a different default -keyserver. It makes no sense to apply Kristian's certificate -authority to anything other than the literal host -hkps.pool.sks-keyservers.net. - -Signed-off-by: Daniel Kahn Gillmor -GnuPG-Bug-Id: 4593 ---- - dirmngr/http.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dirmngr/http.c b/dirmngr/http.c -index 384f2569d..8e5d53939 100644 ---- a/dirmngr/http.c -+++ b/dirmngr/http.c -@@ -767,7 +767,7 @@ http_session_new (http_session_t *r_session, - - is_hkps_pool = (intended_hostname - && !ascii_strcasecmp (intended_hostname, -- get_default_keyserver (1))); -+ "hkps.pool.sks-keyservers.net")); - - /* If the user has not specified a CA list, and they are looking - * for the hkps pool from sks-keyservers.net, then default to --- -2.22.0 - diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 3a4309075b76..de8bb4027b3b 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - - # The following patch has no effect as the code is - # "[d]isabled for 2.2.19 to due problems with the standard hkps pool." - #./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch - ./22-allow-import-of-previously-known-keys-even-without-UI.patch ]; diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 0334964c473a..a8083215d17b 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -37,13 +37,7 @@ stdenv.mkDerivation rec { ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - - # The following patch has no effect as the code is - # "[d]isabled for 2.3.2 to due problems with the standard hkps pool." - #./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch - ./24-allow-import-of-previously-known-keys-even-without-UI.patch - # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch ]; From fcb0ec3f59d526e3e5836f6f7e4b4385cae3fa6d Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 4 Apr 2023 20:50:54 -0700 Subject: [PATCH 05/62] xmp: add Darwin support XMP supports Darwin so long as CoreAudio is available. This PR makes alsa Linux-specific and adds the appropriate Darwin dependencies. --- pkgs/applications/audio/xmp/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 6c0d439a0d1b..14d425f688fb 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }: stdenv.mkDerivation rec { pname = "xmp"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Extended module player"; homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; src = fetchurl { @@ -17,5 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib libxmp ]; + buildInputs = [ libxmp ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cca980259525..36c740fc0942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34955,7 +34955,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - xmp = callPackage ../applications/audio/xmp { }; + xmp = callPackage ../applications/audio/xmp { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; xnee = callPackage ../tools/X11/xnee { }; From fb1a7a47914d41099cae4e4fb6bac2d3416cee7c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 28 Mar 2023 22:19:58 +0200 Subject: [PATCH 06/62] osv-scanner: 1.2.0 -> 1.3.1 https://github.com/google/osv-scanner/releases/tag/v1.3.0 https://github.com/google/osv-scanner/releases/tag/v1.3.1 --- pkgs/tools/security/osv-scanner/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 588370bd3a4b..4df86e487a6c 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,20 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-5078mJbqiWu+Q0oOWaCJ8YUlSTRDLjmztAhtVyFlvN8="; + hash = "sha256-0P7mcrswWvyqv7a/jyONt/3BSim0IvQUgzjO7swTWn0="; }; - vendorHash = "sha256-LxwP1eK88H/XsGsu8YA3ksZnYJcOr7OzqWmZDRHO5kU="; + vendorHash = "sha256-MMEkgGyetwMEiD242CPYh619o4bo4zj87jnl7HvS0OE="; + + subPackages = [ + "cmd/osv-scanner" + ]; ldflags = [ "-s" From 980eb173974932b975c35de0426e86d8fa89281e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 8 Apr 2023 00:07:58 +0200 Subject: [PATCH 07/62] haskellPackages: stackage LTS 20.16 -> LTS 20.17 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 242fef5407cd..c50c8ca2d455 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.16 +# Stackage LTS 20.17 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -10,7 +10,7 @@ default-package-overrides: - ace ==0.6 - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - - active ==0.2.0.16 + - active ==0.2.0.17 - ad ==4.5.4 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 @@ -64,7 +64,7 @@ default-package-overrides: - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.9.4 + - apecs ==0.9.5 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 @@ -166,7 +166,7 @@ default-package-overrides: - bech32 ==1.1.2 - bech32-th ==1.1.1 - bench ==1.0.12 - - benchpress ==0.2.2.21 + - benchpress ==0.2.2.22 - bench-show ==0.3.2 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 @@ -624,7 +624,7 @@ default-package-overrides: - doctemplates ==0.10.0.2 - doctest ==0.20.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.6 + - doctest-driver-gen ==0.3.0.7 - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doctest-parallel ==0.2.6 @@ -700,7 +700,7 @@ default-package-overrides: - enum-text ==0.5.3.0 - envelope ==0.2.2.0 - envparse ==0.5.0 - - envy ==2.1.1.0 + - envy ==2.1.2.0 - eq ==4.3 - equational-reasoning ==0.7.0.1 - equivalence ==0.4.1 @@ -742,7 +742,7 @@ default-package-overrides: - extensible ==0.9 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.12 + - extra ==1.7.13 - extractable-singleton ==0.0.1 - extrapolate ==0.4.6 - fail ==4.9.0.0 @@ -806,7 +806,7 @@ default-package-overrides: - fmlist ==0.9.4 - fmt ==0.6.3.0 - fn ==0.3.0.2 - - focus ==1.0.3 + - focus ==1.0.3.1 - focuslist ==0.1.1.0 - foldl ==1.4.14 - folds ==0.7.8 @@ -929,28 +929,28 @@ default-package-overrides: - ghc-typelits-natnormalise ==0.7.8 - ghc-typelits-presburger ==0.6.2.0 - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.25 - - gi-cairo ==1.0.27 + - gi-atk ==2.0.27 + - gi-cairo ==1.0.29 - gi-cairo-connector ==0.1.1 - gi-cairo-render ==0.1.2 - - gi-dbusmenu ==0.4.11 - - gi-dbusmenugtk3 ==0.4.12 - - gi-freetype2 ==2.0.2 - - gi-gdk ==3.0.26 - - gi-gdkpixbuf ==2.0.29 - - gi-gdkx11 ==3.0.13 - - gi-gio ==2.0.30 - - gi-glib ==2.0.27 - - gi-gmodule ==2.0.3 - - gi-gobject ==2.0.28 - - gi-graphene ==1.0.5 - - gi-gtk ==3.0.39 - - gi-gtk-hs ==0.3.13 - - gi-gtksource ==3.0.26 - - gi-harfbuzz ==0.0.7 - - gi-javascriptcore ==4.0.25 + - gi-dbusmenu ==0.4.13 + - gi-dbusmenugtk3 ==0.4.14 + - gi-freetype2 ==2.0.4 + - gi-gdk ==3.0.28 + - gi-gdkpixbuf ==2.0.31 + - gi-gdkx11 ==3.0.15 + - gi-gio ==2.0.32 + - gi-glib ==2.0.29 + - gi-gmodule ==2.0.5 + - gi-gobject ==2.0.30 + - gi-graphene ==1.0.7 + - gi-gtk ==3.0.41 + - gi-gtk-hs ==0.3.14 + - gi-gtksource ==3.0.28 + - gi-harfbuzz ==0.0.9 + - gi-javascriptcore ==4.0.27 - gio ==0.13.8.2 - - gi-pango ==1.0.27 + - gi-pango ==1.0.29 - githash ==0.1.6.3 - github ==0.28.0.1 - github-release ==2.0.0.5 @@ -961,8 +961,8 @@ default-package-overrides: - git-lfs ==1.2.0 - gitlib ==3.1.3 - gitrev ==1.3.1 - - gi-vte ==2.91.30 - - gi-xlib ==2.0.12 + - gi-vte ==2.91.31 + - gi-xlib ==2.0.13 - gl ==0.9 - glasso ==0.1.0 - GLFW-b ==3.3.0.0 @@ -1391,7 +1391,7 @@ default-package-overrides: - kan-extensions ==5.2.5 - kanji ==3.5.0 - kansas-comet ==0.4.1 - - katip ==0.8.7.3 + - katip ==0.8.7.4 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.1 - kazura-queue ==0.1.0.4 @@ -1644,7 +1644,7 @@ default-package-overrides: - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - mongoDB ==2.7.1.2 - - monoidal-containers ==0.6.3.0 + - monoidal-containers ==0.6.4.0 - monoid-extras ==0.6.2 - monoid-subclasses ==1.1.3 - monoid-transformer ==0.0.4 @@ -2030,7 +2030,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - - pusher-http-haskell ==2.1.0.12 + - pusher-http-haskell ==2.1.0.13 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - PyF ==0.11.1.1 @@ -2105,7 +2105,7 @@ default-package-overrides: - redis-resp ==1.0.0 - reducers ==3.12.4 - refact ==0.3.0.2 - - ref-fd ==0.5 + - ref-fd ==0.5.0.1 - refined ==0.8 - reflection ==2.1.7 - reform ==0.2.7.5 @@ -2487,7 +2487,7 @@ default-package-overrides: - swish ==0.10.4.0 - syb ==0.7.2.3 - syb-with-class ==0.6.1.14 - - sydtest ==0.13.0.2 + - sydtest ==0.13.0.4 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 @@ -2958,11 +2958,11 @@ default-package-overrides: - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - - xmonad ==0.17.1 + - xmonad ==0.17.2 - xmonad-contrib ==0.17.1 - xmonad-extras ==0.17.0 - xor ==0.0.1.1 - - xss-sanitize ==0.3.7.1 + - xss-sanitize ==0.3.7.2 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.0 - yaml-unscrambler ==0.1.0.13 From 9ae0cb15a036168b5c8bac474ee1c3b75fd1378b Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 8 Apr 2023 00:08:14 +0200 Subject: [PATCH 08/62] all-cabal-hashes: 2023-04-03T07:13:26Z -> 2023-04-07T21:49:23Z 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 eeff6d7cef9d..98511f02eaf0 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "cf82f82661a5662581a4385c693552b18009b7e2", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/cf82f82661a5662581a4385c693552b18009b7e2.tar.gz", - "sha256": "0wwyikl44dg5x6hirxxqdzbh4ixkpxknd4c0nacsc2mqpjm1wrwq", - "msg": "Update from Hackage at 2023-04-03T07:13:26Z" + "commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz", + "sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4", + "msg": "Update from Hackage at 2023-04-07T21:49:23Z" } From 96062ba9fb3ac274ed688da6f82b649701083970 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 8 Apr 2023 00:12:45 +0200 Subject: [PATCH 09/62] 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 | 2084 ++++++++++------- 1 file changed, 1208 insertions(+), 876 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7d30b20bc2d6..6f04b00479d2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14427,8 +14427,8 @@ self: { ({ mkDerivation, base, doctest, hspec, process, time }: mkDerivation { pname = "Monadoro"; - version = "0.3.5.0"; - sha256 = "1gj6s043241wcdx5wbc6jdihnlrcrdzxjr60g7i13k6himhbx739"; + version = "0.3.6.1"; + sha256 = "1163109ps6nlizf7ng5vyjfz0033qnn8bpnayd0qdy9ipcd98c5m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -17963,6 +17963,37 @@ self: { broken = true; }) {}; + "ReplaceUmlaut" = callPackage + ({ mkDerivation, base, dir-traverse, HTF, optparse-applicative + , text, transformers, uniform-cmdLineArgs, uniform-fileio + , uniform-json, uniform-pandoc, uniformBase + }: + mkDerivation { + pname = "ReplaceUmlaut"; + version = "0.1.5.3"; + sha256 = "00nvg69lhyhnjq7gb6l74rpa5h0nic2717g6wz1w313jhi7frxqd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dir-traverse optparse-applicative text transformers + uniform-cmdLineArgs uniform-fileio uniform-json uniform-pandoc + uniformBase + ]; + executableHaskellDepends = [ + base dir-traverse optparse-applicative text transformers + uniform-cmdLineArgs uniform-fileio uniform-json uniform-pandoc + uniformBase + ]; + testHaskellDepends = [ + base dir-traverse HTF optparse-applicative text transformers + uniform-cmdLineArgs uniform-fileio uniform-json uniform-pandoc + uniformBase + ]; + description = "converting text to properly encoded german umlauts"; + license = "GPL"; + mainProgram = "replaceUmlaut"; + }) {}; + "ReplicateEffects" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -18104,15 +18135,15 @@ self: { "RtMidi" = callPackage ({ mkDerivation, alsa-lib, base, deepseq, pretty-simple, tasty - , tasty-hunit, unliftio-core, vector + , tasty-hunit, vector }: mkDerivation { pname = "RtMidi"; - version = "0.5.0.2"; - sha256 = "1mlb611ilamjd884da57zy5c2jga4d5nbjy2yphnn0fcn7lzymyk"; + version = "0.6.1.0"; + sha256 = "0x2hk8bg3bwnhl1si7wll47xn2xq1dj3lakhg03is5j2692lpalk"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq unliftio-core vector ]; + libraryHaskellDepends = [ base deepseq vector ]; librarySystemDepends = [ alsa-lib ]; executableHaskellDepends = [ base pretty-simple vector ]; testHaskellDepends = [ base tasty tasty-hunit vector ]; @@ -22217,10 +22248,8 @@ self: { }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2.5"; - sha256 = "08gbvlsf37nx982qs19pb9qc5sxi6493f02d3afjsyxqvalfbijy"; - revision = "1"; - editedCabalFile = "0vk991m2b14sqs74fnbxfymp9hzvmn30xkrngkhl6idyqgc0hsbd"; + version = "0.2.2.7"; + sha256 = "1yzhjvlx0vi8ibpnxyf2k6hfxs3f48f0wmd0ilapmpqyx649jffy"; libraryHaskellDepends = [ base template-haskell text Win32 ]; testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; @@ -24221,6 +24250,39 @@ self: { mainProgram = "acid-state-repair"; }) {}; + "acid-state_0_16_1_2" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , criterion, deepseq, directory, filelock, filepath, hedgehog + , hspec, hspec-discover, mtl, network, network-bsd, random + , safecopy, stm, system-fileio, system-filepath, template-haskell + , text, th-expand-syns, time, unix + }: + mkDerivation { + pname = "acid-state"; + version = "0.16.1.2"; + sha256 = "1ixg62liif1g18ggxap8zdhzy261fj5d24pmb0n36gfhz18b38bx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring cereal containers directory filelock filepath + mtl network network-bsd safecopy stm template-haskell + th-expand-syns unix + ]; + executableHaskellDepends = [ base directory ]; + testHaskellDepends = [ + base cereal containers deepseq directory hedgehog hspec + hspec-discover mtl network safecopy template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion directory mtl random system-fileio system-filepath + ]; + description = "Add ACID guarantees to any serializable Haskell data structure"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + mainProgram = "acid-state-repair"; + }) {}; + "acid-state-dist" = callPackage ({ mkDerivation, acid-state, base, bytestring, cereal , concurrent-extra, containers, criterion, directory, filepath, mtl @@ -24939,26 +25001,6 @@ self: { }) {}; "active" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids - , semigroups, vector - }: - mkDerivation { - pname = "active"; - version = "0.2.0.16"; - sha256 = "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i"; - revision = "1"; - editedCabalFile = "0cyfwrr5c14f5rgrf8dv7i8qsrnmnzigw0xp6l88kfxd61zhk4n8"; - libraryHaskellDepends = [ - base lens linear semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base lens linear QuickCheck semigroupoids semigroups vector - ]; - description = "Abstractions for animation"; - license = lib.licenses.bsd3; - }) {}; - - "active_0_2_0_17" = callPackage ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids , semigroups, vector }: @@ -24972,7 +25014,6 @@ self: { testHaskellDepends = [ base linear QuickCheck semigroups ]; description = "Abstractions for animation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "activehs" = callPackage @@ -25545,6 +25586,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-real_0_2_13_0" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.13.0"; + sha256 = "13k0nb12zyp560chjwrk0jn677s7qycv976vv462niiqrc0z4zh7"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as convergent sequences of intervals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson_1_5_6_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring @@ -26937,6 +26999,25 @@ self: { broken = true; }) {}; + "agda2hs" = callPackage + ({ mkDerivation, Agda, base, containers, deepseq, directory + , filepath, haskell-src-exts, mtl, syb, text, unordered-containers + }: + mkDerivation { + pname = "agda2hs"; + version = "1.0"; + sha256 = "1r2ac4sqm86w88hk3fwkv0zviv7zy9nykw6cayg0240k1sw6j4qb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + Agda base containers deepseq directory filepath haskell-src-exts + mtl syb text unordered-containers + ]; + description = "Compiling Agda code to readable Haskell"; + license = lib.licenses.bsd3; + mainProgram = "agda2hs"; + }) {}; + "agda2lagda" = callPackage ({ mkDerivation, base, directory, filepath, goldplate , optparse-applicative, process @@ -27512,6 +27593,25 @@ self: { mainProgram = "alex"; }) {}; + "alex_3_2_7_2" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + }: + mkDerivation { + pname = "alex"; + version = "3.2.7.2"; + sha256 = "04yfq9inq6waw1imkj3xqfg2riijzzwlnphbll7r9gjvraw8gpmy"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers directory ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "alex"; + }) {}; + "alex-meta" = callPackage ({ mkDerivation, alex, array, base, containers, happy , haskell-src-meta, QuickCheck, template-haskell @@ -32781,25 +32881,6 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, array, base, containers, criterion, exceptions - , linear, mtl, QuickCheck, template-haskell, vector - }: - mkDerivation { - pname = "apecs"; - version = "0.9.4"; - sha256 = "0h4pdfh6c2cc9w13crn90rlllykv2axjfmxb74ji2l9m17m4w4vy"; - revision = "1"; - editedCabalFile = "1n0sz1230fp65dv462ss15yma6g1dxxlamj7idgl3kg9gdwv70sn"; - libraryHaskellDepends = [ - array base containers exceptions mtl template-haskell vector - ]; - testHaskellDepends = [ base containers linear QuickCheck vector ]; - benchmarkHaskellDepends = [ base criterion linear ]; - description = "Fast Entity-Component-System library for game programming"; - license = lib.licenses.bsd3; - }) {}; - - "apecs_0_9_5" = callPackage ({ mkDerivation, array, base, containers, criterion, exceptions , linear, mtl, QuickCheck, template-haskell, vector }: @@ -32814,7 +32895,6 @@ self: { benchmarkHaskellDepends = [ base criterion linear ]; description = "Fast Entity-Component-System library for game programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "apecs-gloss" = callPackage @@ -35411,8 +35491,8 @@ self: { }: mkDerivation { pname = "asana"; - version = "1.0.0.0"; - sha256 = "0iz1zzisx2ap89p0wdfxpdcbv7zgf00g1lfa00s1ndrkgpxn9ivr"; + version = "1.0.1.0"; + sha256 = "14ppgjjqxylkpy24bkaqlbcsbklrdgrlnm7dqalk1nzv37zqijys"; libraryHaskellDepends = [ aeson aeson-casing base bytestring hashable http-conduit iso8601-time microlens microlens-mtl monad-logger mtl scientific @@ -38114,8 +38194,8 @@ self: { ({ mkDerivation, base, reflection }: mkDerivation { pname = "auto-lift-classes"; - version = "1"; - sha256 = "02809ihgynxc20riycghgiw016xpgqh7234bs8m1ilvr7hnnwpr1"; + version = "1.0.1"; + sha256 = "031nrlghi8xmfx5wc32bcvy1fngrsd7jcjc99kfvxqyzi12ym74k"; libraryHaskellDepends = [ base reflection ]; testHaskellDepends = [ base ]; description = "Deriving (Show|Read)(1|2)"; @@ -40254,8 +40334,8 @@ self: { }: mkDerivation { pname = "balkon"; - version = "0.2.0.0"; - sha256 = "15fggxakzqyiwn7mpcwc3w7qiagb89x7f21mls25275vy9miz3xv"; + version = "0.2.1.0"; + sha256 = "0nw6ghpyyra7b1klmvyf1y8xappddyzja9lp2w5sih8103slvb2y"; libraryHaskellDepends = [ base harfbuzz-pure text text-icu unicode-data-scripts ]; @@ -42643,21 +42723,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.21"; - sha256 = "1rbkryxrzgzas7vv4rpxy718rgpmpmklnlmz91f09bn0qm8zdnnd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring time ]; - description = "Micro-benchmarking with detailed statistics"; - license = lib.licenses.bsd3; - mainProgram = "example"; - }) {}; - - "benchpress_0_2_2_22" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -42669,7 +42734,6 @@ self: { executableHaskellDepends = [ base bytestring time ]; description = "Micro-benchmarking with detailed statistics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -52412,8 +52476,8 @@ self: { pname = "ca-province-codes"; version = "1.0.0.0"; sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3"; - revision = "1"; - editedCabalFile = "0502zw8bbx6761s8dfnmbnw475y9x2ikk8s281j1fd1db3wdv17l"; + revision = "2"; + editedCabalFile = "0qi0yzhh319wpvd6584b6rq15rhyz6bz13xbhri7754pyb6rkis8"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base hspec QuickCheck text ]; description = "ISO 3166-2:CA Province Codes and Names"; @@ -54259,8 +54323,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.4.1"; - sha256 = "0nip2lxpfrw0vnhi36sp503323zqnpskfx6m0qs5if64s3vx8qhh"; + version = "1.4.2"; + sha256 = "09fpbcghaz8423has79kzjd954mxg5lkjg0k6rz6834gv5p0z5bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54303,8 +54367,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.4.1"; - sha256 = "093w7hvbdz897jm3sns47sna8na6icqms421kzr841abrriqhjdq"; + version = "1.4.2"; + sha256 = "018n0ifhrajjjyq0r9scg8ifjrz3w7q58p1qfak1hwh7a1wdyxsx"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring conduit cookie cryptonite deepseq deriving-aeson exceptions http-api-data @@ -58145,6 +58209,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "chart-svg_0_4_0" = callPackage + ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color + , containers, cubicbezier, flatparse, foldl, formatn, mtl, numhask + , numhask-array, numhask-space, optics-core, random + , string-interpolate, tasty, tasty-golden, text, time, tree-diff + }: + mkDerivation { + pname = "chart-svg"; + version = "0.4.0"; + sha256 = "1nsg5njv2sjg9rk5r0i3hx5p6vh8pa16m1mcgc6bf8cddkmgglip"; + libraryHaskellDepends = [ + adjunctions attoparsec base bytestring Color containers cubicbezier + flatparse foldl formatn mtl numhask numhask-array numhask-space + optics-core random string-interpolate text time tree-diff + ]; + testHaskellDepends = [ + base bytestring flatparse tasty tasty-golden tree-diff + ]; + description = "Charting library targetting SVGs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chart-svg-various" = callPackage ({ mkDerivation, base, box, box-csv, box-socket, chart-svg , concurrency, doctest, foldl, lens, lucid, mealy, numhask @@ -61910,24 +61997,24 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blitz, bytestring - , conduit, mtl, network, text + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit, mtl + , network, text }: mkDerivation { pname = "clplug"; - version = "0.3.2.0"; - sha256 = "0ix64gm30zh4n9h9sc30dgfaqi8inlf5jakpgi8l2ks9pqi0d6n5"; + version = "0.4.0.0"; + sha256 = "02gixg9xww0gis67rap70pwbrg4gpi514iphbfjqjzbh2chdil5j"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit mtl network text ]; testHaskellDepends = [ - aeson attoparsec base blitz bytestring conduit mtl network text + aeson attoparsec base bytestring conduit mtl network text ]; description = "Create Core Lightning Plugins"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {blitz = null;}; + }) {}; "clr-bindings" = callPackage ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes @@ -69770,6 +69857,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_9_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.9.1"; + sha256 = "16gw12b0dlb6vji0b6lyiydax4nd2h41hbjr7qvlcyiwz3zc5ji4"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-effect-effectful" = callPackage ({ mkDerivation, base, core-data, core-program, core-text , effectful-core @@ -69824,6 +69929,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_6_5_1" = 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.5.1"; + sha256 = "08znxjkr3mkkcj9chgps158a5i1szclan2nsji4lq4c7q9678f21"; + 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl @@ -69897,16 +70024,16 @@ self: { "core-webserver-warp" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-trie , core-data, core-program, core-telemetry, core-text, http-types - , http2, mtl, safe-exceptions, vault, wai, warp + , http2, mtl, safe-exceptions, vault, wai, warp, warp-tls }: mkDerivation { pname = "core-webserver-warp"; - version = "0.2.0.0"; - sha256 = "0z0jjcj5gdcgxnnsjay5g2nw0ls43qslm3345n6732l515czivk7"; + version = "0.2.1.0"; + sha256 = "0j7bbs7fbzzk2czz5hxmd15vgx6gh73n65z1r1wbsb9f8zaw34fg"; libraryHaskellDepends = [ async base bytestring bytestring-trie core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault - wai warp + wai warp warp-tls ]; description = "Interoperability with Wai/Warp"; license = lib.licenses.mit; @@ -72364,8 +72491,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; - revision = "1"; - editedCabalFile = "0s2f5cd46lqymmbpcnzlxsim5qk8yrr52j5mmi31zrhd24b3bqln"; + revision = "2"; + editedCabalFile = "112lx16przdk80m269rqizma0lxaij52l4haspb0cd07rbgp50cd"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -72384,8 +72511,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; - revision = "1"; - editedCabalFile = "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b"; + revision = "2"; + editedCabalFile = "1v495qn836flf4nhn43sbq14bhqfljvcpncmfrnvkhbrp5drxgi5"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -74322,8 +74449,8 @@ self: { }: mkDerivation { pname = "dahdit"; - version = "0.1.1"; - sha256 = "00i6gn4m65zpp200hz1813jsb41d4jgjhcqmwf74iq4hi6440z7q"; + version = "0.1.4"; + sha256 = "01ixh5rl5ls09zrmz50ph81swx28gn7aw3zslj7bbc5fldqdfgzl"; libraryHaskellDepends = [ base bytestring containers data-default data-sword free mtl primitive transformers @@ -74338,6 +74465,38 @@ self: { broken = true; }) {}; + "daino" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, dir-traverse + , filepath, pandoc, pandoc-sidenote, path, path-io, ReplaceUmlaut + , uniform-cmdLineArgs, uniform-http, uniform-json + , uniform-latex2pdf, uniform-pandoc, uniform-shake, uniform-strings + , uniform-watch, uniform-webserver, uniformBase, unix + }: + mkDerivation { + pname = "daino"; + version = "0.1.5.2"; + sha256 = "1d31a7pwzkkbypffz241749iwbpk2jjcvp7rhjg00ixnak221rc5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default-class deepseq dir-traverse filepath pandoc + pandoc-sidenote path path-io ReplaceUmlaut uniform-cmdLineArgs + uniform-http uniform-json uniform-latex2pdf uniform-pandoc + uniform-shake uniform-strings uniform-watch uniform-webserver + uniformBase unix + ]; + executableHaskellDepends = [ + base data-default-class deepseq dir-traverse filepath pandoc + pandoc-sidenote path path-io ReplaceUmlaut uniform-cmdLineArgs + uniform-http uniform-json uniform-latex2pdf uniform-pandoc + uniform-shake uniform-strings uniform-watch uniform-webserver + uniformBase unix + ]; + description = "daino is a static site generator (SSG) using shake and pandoc"; + license = "GPL"; + mainProgram = "daino"; + }) {}; + "damnpacket" = callPackage ({ mkDerivation, attoparsec, base, bytestring, fail, hspec , html-entity, HUnit, QuickCheck, semigroups, template-haskell @@ -77478,6 +77637,34 @@ self: { license = lib.licenses.asl20; }) {}; + "dbus_1_2_28" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.28"; + sha256 = "0j2acn3i85v22vdf1kcjnwx2bagghdv5lil8h4i5v5wnydlaf4vw"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -81487,6 +81674,8 @@ self: { pname = "diagrams-html5"; version = "1.4.1"; sha256 = "0vp99ks9ldy91x1jlla0kyg8sq9748k82ql0jsf0jxhimvwd7vp8"; + revision = "1"; + editedCabalFile = "1liyymlgaqnasc9ar70acg47mgyl10vcily54hjbxlna7yjh4jy8"; libraryHaskellDepends = [ base cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative split @@ -85624,22 +85813,6 @@ self: { }) {}; "doctest-driver-gen" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.3.0.6"; - sha256 = "0a4jdg4mzhdgfal7jp60yrlv63iv7d8f7nxc9aqvrl93mairny8l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = lib.licenses.bsd3; - mainProgram = "doctest-driver-gen"; - }) {}; - - "doctest-driver-gen_0_3_0_7" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; @@ -85652,7 +85825,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "doctest-driver-gen"; }) {}; @@ -85746,6 +85918,8 @@ self: { pname = "doctest-parallel"; version = "0.3.0.1"; sha256 = "17azfkx2hl48gfxhln710lngzbcwfmxv24jqj8h59ydrah9cba11"; + revision = "1"; + editedCabalFile = "0n2kfbqkbxb8mshvxlsc9kg7klgdp9i0raq56x15vdif8sji82qw"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -86453,16 +86627,18 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, flatparse, neat-interpolation, numhask, numhask-space - , optics-core, process-extras, template-haskell, text, these + , containers, flatparse, numhask-space, optics-core, process-extras + , string-interpolate, template-haskell, text, these }: mkDerivation { pname = "dotparse"; - version = "0.0.1"; - sha256 = "1nwbyra3aksllxg5dymjlsy8ikd1rjj5lgfd9gs9s1sh746gakzx"; + version = "0.0.2"; + sha256 = "0585iyxp8ykz55cqkf9ny6iwdf7yg4vws9kpyimp288nvw4jj9la"; + revision = "1"; + editedCabalFile = "1pvj5sf79bjki1zf3hxspvkmp2bnin8fa50n230j9744s99sb4rj"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse - neat-interpolation numhask numhask-space optics-core process-extras + numhask-space optics-core process-extras string-interpolate template-haskell text these ]; description = "dot language parsing and printing"; @@ -92195,6 +92371,8 @@ self: { pname = "entropy"; version = "0.4.1.10"; sha256 = "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"; + revision = "1"; + editedCabalFile = "1c9cf98lhyvq2j5mifzkrvp26i8zg3f93vcjs86m9pxq1xh7pgc2"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -92668,26 +92846,6 @@ self: { }) {}; "envy" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; - version = "2.1.1.0"; - sha256 = "0cc4lxh4zyg388s794i4ydixi83mgzarjldssmccmss9gp90qcj6"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - description = "An environmentally friendly way to deal with environment variables"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "envy_2_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, mtl , QuickCheck, quickcheck-instances, text, time, transformers }: @@ -92704,7 +92862,6 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -96808,24 +96965,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.7.12"; - sha256 = "0g5h8fp0nq4k9asiknw0bhvb10zpfnsixfp0n3xz0rc83pnajwg5"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = lib.licenses.bsd3; - }) {}; - - "extra_1_7_13" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix }: @@ -96841,7 +96980,6 @@ self: { ]; description = "Extra functions I use"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -97473,6 +97611,28 @@ self: { mainProgram = "fallingblocks"; }) {}; + "falsify" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , containers, data-default, mtl, optics-core, optparse-applicative + , QuickCheck, selective, sop-core, splitmix, tagged, tasty + , tasty-hunit, transformers, vector + }: + mkDerivation { + pname = "falsify"; + version = "0.1.1"; + sha256 = "0srhrrx6iw6d8zc0ikikdg1j8yd6x845ja0z5sj340gxr1nvyq3h"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers data-default + mtl optics-core optparse-applicative selective sop-core splitmix + tagged tasty transformers vector + ]; + testHaskellDepends = [ + base containers data-default QuickCheck selective tasty tasty-hunit + ]; + description = "Property-based testing with internal integrated shrinking"; + license = lib.licenses.bsd3; + }) {}; + "familiar-reflection" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -99984,6 +100144,19 @@ self: { license = lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_6" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.6"; + sha256 = "122v6nv13rgi7nprdcpz8zc534i85yz6lshx0jx5mfqjam4zcx5g"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -100961,23 +101134,25 @@ self: { }) {}; "fix-imports" = callPackage - ({ mkDerivation, base, containers, cpphs, deepseq, directory - , filepath, haskell-src-exts, mtl, pretty, process, split - , test-karya, text, time, uniplate + ({ mkDerivation, base, Cabal, containers, cpphs, deepseq, directory + , filepath, ghc-lib-parser, ghc-lib-parser-ex, ghc-paths, mtl + , pretty, process, split, test-karya, text, time, uniplate }: mkDerivation { pname = "fix-imports"; - version = "2.3.0"; - sha256 = "1ysz764i24l30cclw5zzwkk78di8i9qh136abwlpcxyyw4zy2n6d"; + version = "2.4.0"; + sha256 = "0c1qa217wkw0xhgzn57l2brr87fg971vfzk49ls4m6kgyfin8dgx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base containers cpphs deepseq directory filepath haskell-src-exts - mtl pretty process split text time uniplate + base Cabal containers cpphs deepseq directory filepath + ghc-lib-parser ghc-lib-parser-ex ghc-paths mtl pretty process split + text time uniplate ]; testHaskellDepends = [ - base containers cpphs deepseq directory filepath haskell-src-exts - mtl pretty process split test-karya text time uniplate + base Cabal containers cpphs deepseq directory filepath + ghc-lib-parser ghc-lib-parser-ex ghc-paths mtl pretty process split + test-karya text time uniplate ]; description = "Program to manage the imports of a haskell module"; license = lib.licenses.bsd3; @@ -101735,15 +101910,15 @@ self: { license = lib.licenses.mit; }) {}; - "flatparse_0_4_0_2" = callPackage + "flatparse_0_4_1_0" = 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.2"; - sha256 = "0h1vz0qai9zbr6mqfcidpabjxwcr900582sfmslx08bksssfssbf"; + version = "0.4.1.0"; + sha256 = "0hmi8h74haw21fdgvrqf71vawbjafyg6pmxlpa7pqd1xbgj1wk6j"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell utf8-string ]; @@ -102767,23 +102942,6 @@ self: { }) {}; "focus" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "focus"; - version = "1.0.3"; - sha256 = "03h6gq0k5z9a7nar29qijfnd4gwxd8h16dfsig74bsdzazj50c1m"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A general abstraction for manipulating elements of container data structures"; - license = lib.licenses.mit; - }) {}; - - "focus_1_0_3_1" = callPackage ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers }: mkDerivation { @@ -102794,7 +102952,6 @@ self: { testHaskellDepends = [ rerebase tasty tasty-hunit ]; description = "A general abstraction for manipulating elements of container data structures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "focuslist" = callPackage @@ -102828,8 +102985,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.10"; - sha256 = "0ql0vi0l19l8559ppb9j0i5w90cgk2l7ipf8laj30xx6xz3yrrji"; + version = "0.2.0.11"; + sha256 = "1i5lbzw2y43ppxk0kaqjap0dxyxpx5vqsvqxb2wqfkm3z8v63cy8"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -109213,16 +109370,18 @@ self: { "generic-persistence" = callPackage ({ mkDerivation, base, convertible, generic-deriving, HDBC - , HDBC-sqlite3, hspec, hspec-discover, QuickCheck + , HDBC-sqlite3, hspec, hspec-discover, QuickCheck, resource-pool }: mkDerivation { pname = "generic-persistence"; - version = "0.3.0.1"; - sha256 = "01qpw1hf593f4hf7j9hhrpm6aclwi55gmqpmmjnpnz18f8ahwygp"; - libraryHaskellDepends = [ base convertible generic-deriving HDBC ]; + version = "0.4.0.0"; + sha256 = "18k08qr3zc56zgk6m2g6mh5138v0lf7rh4warvz8vfpxm5wvbn7i"; + libraryHaskellDepends = [ + base convertible generic-deriving HDBC resource-pool + ]; testHaskellDepends = [ base convertible generic-deriving HDBC HDBC-sqlite3 hspec - hspec-discover QuickCheck + hspec-discover QuickCheck resource-pool ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; @@ -110658,14 +110817,15 @@ self: { "geomancy" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hedgehog - , linear, mono-traversable, simple-affine-space + , linear, mono-traversable, ptrdiff, simple-affine-space }: mkDerivation { pname = "geomancy"; - version = "0.2.4.2"; - sha256 = "0ms2gfhcrxcfg10s3xpaawz4kqs4dy00p5mgc7s6pjiq5qgj4mn4"; + version = "0.2.5.0"; + sha256 = "0mpp2cl5404kxsk2ci8hqawrv6w57adjp92x6jraxf5xghrcs2d6"; libraryHaskellDepends = [ - base containers deepseq mono-traversable simple-affine-space + base containers deepseq mono-traversable ptrdiff + simple-affine-space ]; testHaskellDepends = [ base deepseq hedgehog linear simple-affine-space @@ -111571,8 +111731,8 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.6.3"; - sha256 = "1pwla6985y7kh98rpzl1wrcqcn6w47qaaviyd9vcpkwhgvv62zij"; + version = "0.6.4"; + sha256 = "19bqk98a3w4sd20ynil7b6m8p5qs0vrzwkdji3wv016i89vfsv7x"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ @@ -113540,25 +113700,6 @@ self: { }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage - ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers - }: - mkDerivation { - pname = "gi-atk"; - version = "2.0.25"; - sha256 = "0x3qwz8576c1m2y6sxjjzxi0q5x47lbaawipsiaiimk51x4p4div"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - description = "Atk bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_27" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers @@ -113575,33 +113716,9 @@ self: { libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; - version = "1.0.27"; - sha256 = "1f074s37fw1wjd2ycmji8vhvl1lzaclqh7n2pippdfvhfidrkbxf"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Cairo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo;}; - - "gi-cairo_1_0_29" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -113622,7 +113739,6 @@ self: { ''; description = "Cairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -113744,26 +113860,6 @@ self: { }) {cogl-pango = null;}; "gi-dbusmenu" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu, text, transformers - }: - mkDerivation { - pname = "gi-dbusmenu"; - version = "0.4.11"; - sha256 = "06mzjyn1l97n171c92kvsnhhz2fs1pz48n1bwk1b58wnjdrhhscd"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libdbusmenu ]; - description = "Dbusmenu bindings"; - license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) libdbusmenu;}; - - "gi-dbusmenu_0_4_13" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , libdbusmenu, text, transformers @@ -113781,35 +113877,9 @@ self: { description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk - , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu-gtk3, text, transformers - }: - mkDerivation { - pname = "gi-dbusmenugtk3"; - version = "0.4.12"; - sha256 = "1ky4x665p5f7zlfckz7fykgnl9n839vz5pv4l0lprhp0l04f32hz"; - setupHaskellDepends = [ - base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib - gi-gobject gi-gtk haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf - gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; - description = "DbusmenuGtk bindings"; - license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; - - "gi-dbusmenugtk3_0_4_14" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -113832,29 +113902,9 @@ self: { description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-freetype2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, freetype - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-freetype2"; - version = "2.0.2"; - sha256 = "066xpysbzzfjd0gpjxvhfbgy1zwhqd14gibs4daycszk09d9kspp"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ freetype ]; - description = "freetype2 bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) freetype;}; - - "gi-freetype2_2_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, freetype , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -113871,7 +113921,6 @@ self: { libraryPkgconfigDepends = [ freetype ]; description = "freetype2 bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) freetype;}; "gi-gdk" = callPackage @@ -113882,8 +113931,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.26"; - sha256 = "14271bbi1dy0r1krxg0ry3hqmqv10v55ja55a912qknsq1ya8nka"; + version = "3.0.28"; + sha256 = "0crlbrwdj7myrjlnf7p3h24jl998l3i70afh54chv0cawqxqq114"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -113924,27 +113973,6 @@ self: { }) {inherit (pkgs) gtk4;}; "gi-gdkpixbuf" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; - version = "2.0.29"; - sha256 = "16j3pilr5ffcgxp598svdsbjsgh3ds9a24frkp4ph2g2sjmzdcrk"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gmodule gi-gobject - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gdk-pixbuf ]; - description = "GdkPixbuf bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gdk-pixbuf;}; - - "gi-gdkpixbuf_2_0_31" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -113963,7 +113991,6 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage @@ -113973,8 +114000,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.13"; - sha256 = "0qakqwx59r389nnp2zxcknsri8lm9bzgm9nk7vx4mpsrff65138i"; + version = "3.0.15"; + sha256 = "1pr0rnj3ximb844yhz1bwljk0mywy1z8dcbi6ns25ag07gk2sflv"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -114059,25 +114086,6 @@ self: { }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.30"; - sha256 = "186a8bk2s94awnq4w50w2msdjs08a1mknxb2417qpwzc5yy1f9q3"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "Gio bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-gio_2_0_32" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -114094,7 +114102,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gio-hs-list-model" = callPackage @@ -114134,25 +114141,6 @@ self: { }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; - version = "2.0.27"; - sha256 = "0cd0kbl7lsk5jjilhcs8969xaa7ncm81ilpdsqpxvdm2hgrg06y2"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GLib bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-glib_2_0_29" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -114169,29 +114157,9 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gmodule" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gmodule"; - version = "2.0.3"; - sha256 = "043n3nyxy29chzc7xzhinp40yxazlikqcjdbm3pvh344jv7m5xjx"; - setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GModule bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-gmodule_2_0_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -114208,29 +114176,9 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GModule bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; - version = "2.0.28"; - sha256 = "0av574yvvbky1pm187fmjkmy52lssvv74zad30818qbkzpkwfdx8"; - setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GObject bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-gobject_2_0_30" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -114247,31 +114195,9 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-graphene"; - version = "1.0.5"; - sha256 = "0633cf1n4lzrh0v5ksip4y4qizahyi3cv2njsg0bix802c4pd8rs"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ graphene-gobject ]; - description = "Graphene bindings"; - license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {graphene-gobject = null;}; - - "gi-graphene_1_0_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -114455,8 +114381,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.39"; - sha256 = "0ib53hq6wds44z636frbph2pmzy1bjpkc1kyxx9y09yj5bg3mm6k"; + version = "3.0.41"; + sha256 = "1xsf37wa9kxa54bwclb05vi1j6vjgx6w05aj2an5gr1wlg9aikq9"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -114545,23 +114471,6 @@ self: { }) {}; "gi-gtk-hs" = callPackage - ({ mkDerivation, base, base-compat, containers, gi-gdk - , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl - , text, transformers - }: - mkDerivation { - pname = "gi-gtk-hs"; - version = "0.3.13"; - sha256 = "0w9bjhny6l2ll83ffcdmdzgnza0gfgyqv8v161pj080lsq00fdli"; - libraryHaskellDepends = [ - base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject - gi-gtk haskell-gi-base mtl text transformers - ]; - description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = lib.licenses.lgpl21Only; - }) {}; - - "gi-gtk-hs_0_3_14" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl , text, transformers @@ -114576,7 +114485,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {}; "gi-gtk-layer-shell" = callPackage @@ -114649,30 +114557,6 @@ self: { }) {gtksheet = null;}; "gi-gtksource" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; - version = "3.0.26"; - sha256 = "0xax0w5zxiqw2nhz3ndl6kyxfa61n1ldwq3r6s1i0khz0xx79k5q"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-gtk gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - description = "GtkSource bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_28" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base @@ -114694,7 +114578,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -114724,27 +114607,6 @@ self: { }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 - , gi-glib, gi-gobject, harfbuzz, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-harfbuzz"; - version = "0.0.7"; - sha256 = "05w123b1w3bjbaj0wq82b51bx4vnfbb6qcsd94svbhxgi705sjfx"; - setupHaskellDepends = [ - base Cabal gi-freetype2 gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-freetype2 gi-glib gi-gobject - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ harfbuzz ]; - description = "HarfBuzz bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) harfbuzz;}; - - "gi-harfbuzz_0_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 , gi-glib, gi-gobject, harfbuzz, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -114763,7 +114625,6 @@ self: { libraryPkgconfigDepends = [ harfbuzz ]; description = "HarfBuzz bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) harfbuzz;}; "gi-ibus" = callPackage @@ -114795,8 +114656,8 @@ self: { }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.25"; - sha256 = "1dcg3c9df2gg6vqrv7ai18lnxw6zlwn6qyn2k10p4d4h0dpq9ck8"; + version = "4.0.27"; + sha256 = "14kimawwlp7ip5d34aamwsa965lvw979dqgzd6wxl9cfskacj7lq"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -114894,31 +114755,6 @@ self: { }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers, gi-gio - , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base - , haskell-gi-overloading, pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; - version = "1.0.27"; - sha256 = "00v6kn1k9rzlncl867xwbis1jqy5vc12gkmbsij4hxfjr9h0h1cq"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject gi-harfbuzz haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject gi-harfbuzz - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Pango bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pango_1_0_29" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers, gi-gio , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base , haskell-gi-overloading, pango, text, transformers @@ -114941,7 +114777,6 @@ self: { ''; description = "Pango bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -115100,31 +114935,6 @@ self: { }) {inherit (pkgs) vips;}; "gi-vte" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; - version = "2.91.30"; - sha256 = "1n787xacng9279y7vi2g4lmxvx8xgb967v55fxvmxhjyds35fy4w"; - setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango - haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_31" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -115147,7 +114957,6 @@ self: { description = "Vte bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -115277,25 +115086,6 @@ self: { }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, libX11, text - , transformers - }: - mkDerivation { - pname = "gi-xlib"; - version = "2.0.12"; - sha256 = "0dy1xfzbhkyh7nj270mmz1acnwdf0f7c3rzz31lw9zrjyf9670gj"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libX11 ]; - description = "xlib bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.xorg) libX11;}; - - "gi-xlib_2_0_13" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, haskell-gi-overloading, libX11, text , transformers @@ -115312,7 +115102,6 @@ self: { libraryPkgconfigDepends = [ libX11 ]; description = "xlib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.xorg) libX11;}; "giak" = callPackage @@ -115605,8 +115394,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230329"; - sha256 = "1rh2y2cz96b2lgz399d9n2xg19p8h5clviqmy5r6f0bgd3n7v7x1"; + version = "10.20230407"; + sha256 = "19500i3xcmxbh990kmdqimknlpk55z5iz9lnm3w35g8hmrpfh0d0"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -126299,8 +126088,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "1"; - editedCabalFile = "0mqwr0vbpj9zw7f1p5kdd7hsr76gs1ijmh8h9hak47nphffi1fxv"; + revision = "2"; + editedCabalFile = "04hvk5q2x8j75z1yknfxa1607hwb8xx4k5bgdq8qmw2a5zkb5fyy"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -130638,32 +130427,34 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base-compat, base16-bytestring, binary, bytestring, Cabal - , cabal-install-parsers, containers, cryptohash-sha256, deepseq - , Diff, directory, exceptions, filepath, generic-lens-lite, HsYAML - , indexed-traversable, indexed-traversable-instances, ini, lattices - , mtl, network-uri, optparse-applicative, parsec, pretty, process - , ShellCheck, tasty, tasty-golden, temporary, text, transformers - , unordered-containers, zinza + , base-compat, base16-bytestring, binary, bytestring + , cabal-install-parsers, Cabal-syntax, containers + , cryptohash-sha256, deepseq, Diff, directory, exceptions, filepath + , generic-lens-lite, HsYAML, indexed-traversable + , indexed-traversable-instances, ini, lattices, mtl, network-uri + , optparse-applicative, parsec, pretty, process, ShellCheck, tasty + , tasty-golden, temporary, text, transformers, unordered-containers + , zinza }: mkDerivation { pname = "haskell-ci"; - version = "0.14.3"; - sha256 = "0hxds3rhikmsg35wdx23lmbkkay0cn4d2m7pfmrybcgw419hzhb0"; + version = "0.16"; + sha256 = "1v534l168z2gaxw79hm1c5liwv744v99dwzvzw4hyl7107b42s7i"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base-compat base16-bytestring binary - bytestring Cabal cabal-install-parsers containers cryptohash-sha256 - deepseq directory exceptions filepath generic-lens-lite HsYAML - indexed-traversable indexed-traversable-instances ini lattices mtl - network-uri optparse-applicative parsec pretty process ShellCheck - temporary text transformers unordered-containers zinza + bytestring cabal-install-parsers Cabal-syntax containers + cryptohash-sha256 deepseq directory exceptions filepath + generic-lens-lite HsYAML indexed-traversable + indexed-traversable-instances ini lattices mtl network-uri + optparse-applicative parsec pretty process ShellCheck temporary + text transformers unordered-containers zinza ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-terminal base base-compat bytestring Cabal Diff directory - filepath tasty tasty-golden transformers + ansi-terminal base base-compat bytestring Cabal-syntax Diff + directory filepath tasty tasty-golden transformers ]; doHaddock = false; description = "Cabal package script generator for Travis-CI"; @@ -134696,6 +134487,27 @@ self: { mainProgram = "hasql-notifications"; }) {}; + "hasql-notifications_0_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec + , postgresql-libpq, QuickCheck, text + }: + mkDerivation { + pname = "hasql-notifications"; + version = "0.2.0.4"; + sha256 = "0r8vmp5pqzsc37ifsri5v3m5nmj5k1pid4yxhqqiyg7vimr5i89n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring hasql hasql-pool postgresql-libpq text + ]; + executableHaskellDepends = [ base hasql ]; + testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; + description = "LISTEN/NOTIFY support for Hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hasql-notifications"; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -134711,6 +134523,23 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-optparse-applicative_0_7" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, hasql + , hasql-pool, optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.7"; + sha256 = "0kngkykspy20by86psdjf40m4lm7v1bs5f5w1lqn98dmlnvpqxd9"; + libraryHaskellDepends = [ + attoparsec attoparsec-time base hasql hasql-pool + optparse-applicative + ]; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-pipes" = callPackage ({ mkDerivation, base, bytestring-tree-builder, hasql, pipes , pipes-safe, protolude @@ -134740,6 +134569,21 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-pool_0_9" = callPackage + ({ mkDerivation, async, base, hasql, hspec, random, rerebase, stm + , time + }: + mkDerivation { + pname = "hasql-pool"; + version = "0.9"; + sha256 = "1ngz4pmkj31nyv3gb0lrq15wk3ax7h3gga1df17lm2q2y9cb0gip"; + libraryHaskellDepends = [ base hasql stm time ]; + testHaskellDepends = [ async hasql hspec random rerebase ]; + description = "Pool of connections for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -137380,6 +137224,8 @@ self: { pname = "hedgehog"; version = "1.2"; sha256 = "0zlfmzzancsglzqmdr40kdfk3ih7anssfkb196r0n9b5lvdcfn98"; + revision = "1"; + editedCabalFile = "1am5x5y2zzfii2zk6w8kbw6rv8c4y272vsl5213f99ypvbqv086b"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -142288,6 +142134,33 @@ self: { broken = true; }) {}; + "hix" = callPackage + ({ mkDerivation, aeson, base, Cabal, exon, extra, filepattern + , generic-lens, hedgehog, incipit-base, lens, lens-regex-pcre + , optparse-applicative, path, path-io, random, tasty + , tasty-hedgehog, transformers, unix + }: + mkDerivation { + pname = "hix"; + version = "0.1.1.0"; + sha256 = "0ch2y8axhln64q0cggcrdi4fajxadlv0ibw7gmjdi93ish9hvk48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base Cabal exon extra filepattern generic-lens incipit-base + lens lens-regex-pcre optparse-applicative path path-io random + transformers unix + ]; + executableHaskellDepends = [ base incipit-base ]; + testHaskellDepends = [ + base Cabal exon hedgehog incipit-base path path-io tasty + tasty-hedgehog transformers + ]; + description = "Haskell/Nix development build tools"; + license = "BSD-2-Clause-Patent"; + mainProgram = "hix"; + }) {}; + "hjcase" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, test-framework , test-framework-hunit, text, unordered-containers, vector @@ -142932,27 +142805,26 @@ self: { "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, hspec-discover, megaparsec, microlens - , microlens-th, optparse-applicative, QuickCheck, text, text-zipper - , time, transformers, unordered-containers, vector, vty - , xdg-basedir + , microlens-mtl, microlens-th, optparse-applicative, QuickCheck + , text, text-zipper, time, transformers, unordered-containers + , vector, vty, xdg-basedir }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.17"; - sha256 = "1b3qz5vm8db6gsdakg8nf3qc6rp7mlh3zpkzvhi80pqm3jzdbjph"; - revision = "3"; - editedCabalFile = "0xb476i2xn0ncfqx65qy4vs0g2dchw5p0naxgz4zfmffrmyfsc92"; + version = "1.3.18"; + sha256 = "0j2p785hxjzmisz2yi5841zdfyl1sqjwzacm7ijz9px8gx812kbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory free hledger-lib megaparsec - microlens microlens-th optparse-applicative text text-zipper time - transformers unordered-containers vector vty xdg-basedir + microlens microlens-mtl microlens-th optparse-applicative text + text-zipper time transformers unordered-containers vector vty + xdg-basedir ]; executableHaskellDepends = [ base brick directory free hledger-lib megaparsec microlens - optparse-applicative text text-zipper time transformers - unordered-containers vector vty xdg-basedir + microlens-mtl microlens-th optparse-applicative text text-zipper + time transformers unordered-containers vector vty xdg-basedir ]; testHaskellDepends = [ base free hledger-lib hspec megaparsec QuickCheck text text-zipper @@ -156687,7 +156559,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_4_1_0" = callPackage + "http2_4_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filepath, gauge, Glob, hspec @@ -156697,8 +156569,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "4.1.0"; - sha256 = "0k8xivd19kk1pb2dqnf0amg72bhdicnzzkkabh03qan8n7dbpa3d"; + version = "4.1.2"; + sha256 = "0q4wn0qqswbrw92ypkwzis3nb0jlp8hv9ly5s79mz5n069h2kz0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162697,8 +162569,8 @@ self: { }: mkDerivation { pname = "incipit-base"; - version = "0.5.0.0"; - sha256 = "1h3mmabxb0c29cy349xkk87df4x0dxakfaryyr8r43wj2l39yhj0"; + version = "0.5.1.0"; + sha256 = "0bmnfr9j13hq6jil64yivihbrxmm8qwla76slzisjj8mbk0j6sny"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -162710,8 +162582,8 @@ self: { ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.5.0.0"; - sha256 = "17fbdp2v22fni36ijfm9hb9hkcarg4jy3xksngnhlzxqz77adcyj"; + version = "0.5.1.0"; + sha256 = "1cwp0pyhpnq7mq967wfsf1adj8ljpph14wqj4hkgyl685c3hyv6y"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -165941,8 +165813,8 @@ self: { }: mkDerivation { pname = "ipfs"; - version = "1.4.0"; - sha256 = "1lz5wbjlxd053805cc0l51hj69rwj4a2i4b5y72gmajjqrcw4hcd"; + version = "1.4.1"; + sha256 = "0ixmqbw05061lmxg75pigi9ykj6wn0ywhq9q1gd6z88c3irz2lqq"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media lens monad-logger network-ip regex-compat rio servant servant-client @@ -171642,41 +171514,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.8.7.3"; - sha256 = "10axmys19j47yjxxsmgdj57f1rdszzw03lj4vnx19mqa28kk8fvf"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = lib.licenses.bsd3; - }) {}; - - "katip_0_8_7_4" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -171709,7 +171546,6 @@ self: { ]; description = "A structured logging framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -171809,8 +171645,8 @@ self: { }: mkDerivation { pname = "katip-logzio"; - version = "0.1.1.0"; - sha256 = "1br8phxjf7w2pa6wiig8n054w3qrp2yvsm2vhnkf2syi50mziin0"; + version = "0.1.2.0"; + sha256 = "01rh2fqd73mjw4srljng81q1i5rmjdqi474b4ds7ixvgfishskji"; libraryHaskellDepends = [ aeson async base bytestring errors http-client http-client-tls http-types katip retry safe-exceptions scientific stm stm-chans @@ -172640,8 +172476,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.7.2"; - sha256 = "06abgzc7h6h0xsgrv3b1n2krb2axb7svg00l0rz5k2qs3bz26kfd"; + version = "0.1.8.0"; + sha256 = "1lybgxmvyx74ib9mlg8dx5vgliskrww3810p06ni2wcpg1malycm"; libraryHaskellDepends = [ base binary bytestring containers cryptohash-md5 derive-storable derive-storable-plugin file-embed foldl geomancy GLFW-b ktx-codec @@ -172677,8 +172513,8 @@ self: { }: mkDerivation { pname = "keid-geometry"; - version = "0.1.1.2"; - sha256 = "0pyszmw5h9qgsxx76lgc65i75fgimwg8bwwkk5slsk0ggnadwj6w"; + version = "0.1.1.3"; + sha256 = "1alzwzp70g6mlsisa0w5fw42wiq49j64nny75np458jkl1axif2x"; libraryHaskellDepends = [ base geomancy keid-core mtl rio vector vulkan ]; @@ -172695,8 +172531,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.7.0"; - sha256 = "0amv73z9154r10501wm5zxcc2drqf47xsvygqzhyvs655yfcg0x6"; + version = "0.1.8.0"; + sha256 = "071f7dxfar0r4al3v74h2shb0hgkw1dnw7nbwpahqh6gm5x96ynl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring derive-storable derive-storable-plugin @@ -172709,17 +172545,15 @@ self: { }) {}; "keid-resource-gltf" = callPackage - ({ mkDerivation, base, bytestring, containers, derive-storable - , derive-storable-plugin, geomancy, gltf-codec, keid-core, rio - , rio-app, vulkan + ({ mkDerivation, base, bytestring, containers, geomancy, gltf-codec + , keid-core, rio }: mkDerivation { pname = "keid-resource-gltf"; - version = "0.1.0.0"; - sha256 = "1b5dbrlhb44xmgsv4l5mfwficlkjy3k36b01sha0j6yq1bv6mvhj"; + version = "0.1.0.1"; + sha256 = "1b5bsarlgwgdwmkv9s5ma9lmqmanxr20zdd6dlz3z0akgakzl4h8"; libraryHaskellDepends = [ - base bytestring containers derive-storable derive-storable-plugin - geomancy gltf-codec keid-core rio rio-app vulkan + base bytestring containers geomancy gltf-codec keid-core rio ]; description = "GLTF loader for Keid engine"; license = lib.licenses.bsd3; @@ -172750,8 +172584,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.2.0"; - sha256 = "1n8a33fr8y8wz4nbgn1pijk73ik0jmr6mxp8dnvcad2gp4cr86j5"; + version = "0.1.2.1"; + sha256 = "06w9a69h6qawddyj4i8k69f8a3p5gnc4hz3irrp0yiyfaqrkbcpa"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -173298,6 +173132,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki_1_0_1_0" = callPackage + ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "ki"; + version = "1.0.1.0"; + sha256 = "0jwm1f26c89715vm8z5mwr8dzrgj7vjp4b0drhrivzcp381v28jb"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "A lightweight structured concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ki-effectful" = callPackage ({ mkDerivation, base, effectful-core, ki, stm, tasty, tasty-hunit }: @@ -173528,12 +173375,12 @@ self: { }) {}; "kind-integer" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, singletons }: mkDerivation { pname = "kind-integer"; - version = "0.3"; - sha256 = "1vaylinl8bphlmfx1p7dmv7nabcv3q6rp4ak1bpvicjgxhkrgxg6"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.4"; + sha256 = "0r8bqrj8cb0gc5rvmc8ilzxb6f6giw8ng2n7zj8qcda8drcy51m2"; + libraryHaskellDepends = [ base singletons ]; testHaskellDepends = [ base ]; description = "Type-level integers. Like KnownNat, but for integers."; license = lib.licenses.bsd3; @@ -173542,13 +173389,13 @@ self: { }) {}; "kind-rational" = callPackage - ({ mkDerivation, base, ghc-prim, kind-integer }: + ({ mkDerivation, base, kind-integer, singletons }: mkDerivation { pname = "kind-rational"; - version = "0.2"; - sha256 = "0j6y0n000brpr2l5082d1j59f2bpczymm7qj73ygj4jfy0yajzb9"; - libraryHaskellDepends = [ base ghc-prim kind-integer ]; - testHaskellDepends = [ base kind-integer ]; + version = "0.3"; + sha256 = "05gd6j4vrd0q1am3bcmwbn4frgwmdyz0iyv3spra4z05v5ixk454"; + libraryHaskellDepends = [ base kind-integer singletons ]; + testHaskellDepends = [ base kind-integer singletons ]; description = "Type-level rationals. Like KnownNat, but for rationals."; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -180617,8 +180464,8 @@ self: { }: mkDerivation { pname = "libphonenumber"; - version = "0.1.0.0"; - sha256 = "0v6hcc46rf3ajgzaw7w22n4zqv27y9xraijpwpfbwss8accjwmy7"; + version = "0.1.1.0"; + sha256 = "02d7bin6q26y427fa6xbr48a6ibcjpjbrwd11pky0qjc71i64yhp"; libraryHaskellDepends = [ base bytestring containers deepseq transformers ]; @@ -181613,28 +181460,29 @@ self: { }) {}; "lima" = callPackage - ({ mkDerivation, aeson, base, data-default, optparse-applicative - , string-interpolate, yaml + ({ mkDerivation, base, breakpoint, data-default, directory + , doctest-parallel, hedgehog, microlens, microlens-th + , pretty-simple, string-interpolate, tasty, tasty-hedgehog + , tasty-hunit, text }: mkDerivation { pname = "lima"; - version = "0.1.0.6"; - sha256 = "1hwpfdf9a9bdj0ya5mgi4mql9d6cyx06vhl0039lvx6nhzm6xlkp"; + version = "0.2.0.0"; + sha256 = "0amfvmp5z4824w6bpc49cnayr42fdwqbx0p5pvpva7lrj27pbskr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base data-default optparse-applicative yaml - ]; - executableHaskellDepends = [ - aeson base data-default optparse-applicative yaml + base data-default microlens microlens-th text ]; + executableHaskellDepends = [ base microlens text ]; testHaskellDepends = [ - aeson base data-default optparse-applicative string-interpolate - yaml + base breakpoint directory doctest-parallel hedgehog microlens + pretty-simple string-interpolate tasty tasty-hedgehog tasty-hunit + text ]; - description = "(Haskell or Literate Haskell) <-> Markdown converter"; + description = "Convert between Haskell, Markdown, Literate Haskell, TeX"; license = lib.licenses.mit; - mainProgram = "lima"; + mainProgram = "readme"; }) {}; "limp" = callPackage @@ -190084,15 +189932,15 @@ self: { }) {}; "matchable-th" = callPackage - ({ mkDerivation, base, containers, matchable, template-haskell - , th-abstraction + ({ mkDerivation, base, bifunctors, containers, matchable + , template-haskell, th-abstraction }: mkDerivation { pname = "matchable-th"; - version = "0.1.2.1"; - sha256 = "1dbq3if0bzi6cxi0ic822vbdg7fyik7hp5d68fdlmn6vxh1zlj1n"; + version = "0.2"; + sha256 = "1v2r38r59wk699nsql3mw7z83gm1snvnci146ply34za7i42zp54"; libraryHaskellDepends = [ - base matchable template-haskell th-abstraction + base bifunctors matchable template-haskell th-abstraction ]; testHaskellDepends = [ base containers matchable ]; description = "Generates Matchable instances using TemplateHaskell"; @@ -191249,17 +191097,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, mwc-probability - , numhask, numhask-array, optics-core, primitive, profunctors - , tdigest, text, vector, vector-algorithms + , numhask, numhask-array, primitive, profunctors, tdigest, text + , vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.4.1"; - sha256 = "1qr3pbskcsk8hpw8fb39hcqq9ms7a01cvk44bh1fg35cy826hdhv"; + version = "0.4.2"; + sha256 = "11b4q93sfkjvcg2jpwxp68mvfhk167z08jx0hn0ia682sgvzh4p3"; libraryHaskellDepends = [ adjunctions base containers mwc-probability numhask numhask-array - optics-core primitive profunctors tdigest text vector - vector-algorithms + primitive profunctors tdigest text vector vector-algorithms ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; @@ -191759,20 +191606,19 @@ self: { "melf" = callPackage ({ mkDerivation, base, binary, bytestring, directory, exceptions - , filepath, lens, mtl, optparse-applicative, prettyprinter - , singletons, singletons-base, singletons-th, tasty, tasty-golden - , tasty-hunit, template-haskell, unix + , filepath, lens, mtl, optparse-applicative, prettyprinter, tasty + , tasty-golden, tasty-hunit, template-haskell }: mkDerivation { pname = "melf"; - version = "1.2.0"; - sha256 = "1zhxgmkbadnyapdq2pqg181fbs47pqcd0vwq8k12sbfs9h3rhlzr"; + version = "1.3.0"; + sha256 = "1fk439y6ykdfn36vk1b09x7abp2pin7iw0a73dqxgafagqxp8sqx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary bytestring exceptions lens mtl prettyprinter singletons - singletons-base singletons-th template-haskell + base binary bytestring exceptions lens mtl prettyprinter + template-haskell ]; executableHaskellDepends = [ base binary bytestring exceptions optparse-applicative @@ -191780,8 +191626,7 @@ self: { ]; testHaskellDepends = [ base binary bytestring directory exceptions filepath mtl - prettyprinter singletons singletons-th tasty tasty-golden - tasty-hunit unix + prettyprinter tasty tasty-golden tasty-hunit ]; description = "An Elf parser"; license = lib.licenses.bsd3; @@ -198171,6 +198016,8 @@ self: { pname = "monoid-extras"; version = "0.6.2"; sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; + revision = "1"; + editedCabalFile = "1xl89p6qcir69qg0kn4443swl4kcgl3vm8dbfi86dgr5z6zvpxhc"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -198298,22 +198145,6 @@ self: { }) {}; "monoidal-containers" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens - , newtype, semialign, these, unordered-containers, witherable - }: - mkDerivation { - pname = "monoidal-containers"; - version = "0.6.3.0"; - sha256 = "0m41z50r3jvr8vvfry99kamb2h3knm0g7bqfwspchmhwsgqqczh4"; - libraryHaskellDepends = [ - aeson base containers deepseq hashable lens newtype semialign these - unordered-containers witherable - ]; - description = "Containers with monoidal accumulation"; - license = lib.licenses.bsd3; - }) {}; - - "monoidal-containers_0_6_4_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semialign, these, unordered-containers, witherable }: @@ -198327,7 +198158,6 @@ self: { ]; description = "Containers with monoidal accumulation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoidal-functors" = callPackage @@ -198424,8 +198254,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.3.1"; - sha256 = "1fqm2cwgfs477bj83hcknbbyf7lrsk17ka6i0n11p6bxi9dg1mq1"; + version = "0.0.4.0"; + sha256 = "0k7kyfr23bskfigzbjnlzkyrhn8r1z663zhi5rl22p2l4xq7alv3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -198981,6 +198811,37 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-app, morpheus-graphql-code-gen + , morpheus-graphql-core, morpheus-graphql-server + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.27.1"; + sha256 = "1n9qflbgl7f4qd3sxc6rwnv0rmg0dj731rf1b9avc6xw199ydr3w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-server mtl relude template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-server morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-app" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-core @@ -199008,6 +198869,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-core + , morpheus-graphql-tests, mtl, relude, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.27.1"; + sha256 = "0qs5gx7k1ix4i0mqkmy681xlg7ckr8fy089rj4c25vgv8rm0p36w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec + morpheus-graphql-core mtl relude scientific template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-core morpheus-graphql-tests mtl relude scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -199062,6 +198951,38 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, modern-uri, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell + , text, transformers, unliftio-core, unordered-containers + , websockets, wuss + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.27.1"; + sha256 = "095kyjyv7gyrlqsdbw1aab2l990risr72c2j5gcwskbgqm7p3fip"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req + template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req tasty + tasty-hunit template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-code-gen" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils @@ -199093,6 +199014,38 @@ self: { mainProgram = "morpheus"; }) {}; + "morpheus-graphql-code-gen_0_27_1" = callPackage + ({ mkDerivation, base, bytestring, containers, file-embed, filepath + , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-server + , optparse-applicative, prettyprinter, relude, template-haskell + , text, unordered-containers, yaml + }: + mkDerivation { + pname = "morpheus-graphql-code-gen"; + version = "0.27.1"; + sha256 = "0qvk2zpqhhjjfha5hfd9nkv30m07qbbnpil9h00w3skdw33mqqqk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers file-embed + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-server prettyprinter relude template-haskell text + unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers file-embed filepath Glob + morpheus-graphql-client morpheus-graphql-code-gen-utils + morpheus-graphql-core morpheus-graphql-server optparse-applicative + prettyprinter relude template-haskell text unordered-containers + yaml + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "morpheus"; + }) {}; + "morpheus-graphql-code-gen-utils" = callPackage ({ mkDerivation, base, bytestring, containers , morpheus-graphql-core, mtl, prettyprinter, relude @@ -199110,6 +199063,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "morpheus-graphql-code-gen-utils_0_27_1" = callPackage + ({ mkDerivation, base, bytestring, containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen-utils"; + version = "0.27.1"; + sha256 = "0f8152jzjynfl65k8f4iyyi8akqrcn9dhx8pi20yhf152h5w0clp"; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core mtl prettyprinter + relude template-haskell text unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude @@ -199136,6 +199107,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.27.1"; + sha256 = "1id4dxi4kpgd25ffhw5qgkl05b2642qpz5dss68nq0n1cs2c021b"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-server" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core @@ -199163,6 +199161,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-server_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-server"; + version = "0.27.1"; + sha256 = "0b8hipwp5ddxn92appn2n6s43kmqvqrp2rg055jkb2kcfwh8g828"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers @@ -199181,6 +199207,25 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app + , morpheus-graphql-core, mtl, relude, text, transformers + , unliftio-core, unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.27.1"; + sha256 = "0nj05ywj460v8kd821w7br44bx8wzqbbil0jb42sv442py69d6lj"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers @@ -199197,6 +199242,23 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-tests_0_27_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.27.1"; + sha256 = "1nhpcai8lk3jq676zp6y6jcylm3zjzl4s6hk0f3g7vmg971ycd9w"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -214721,23 +214783,23 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_5_3_0" = callPackage + "ormolu_0_6_0_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring - , Cabal-syntax, containers, Diff, directory, dlist, file-embed + , Cabal-syntax, containers, deepseq, Diff, directory, file-embed , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io , QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.5.3.0"; - sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk"; + version = "0.6.0.1"; + sha256 = "1idmqky5whprjybsf3pmwnxbdqim2qpzk25dqzhkiskpkm1vdkpl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base binary bytestring Cabal-syntax containers - Diff directory dlist file-embed filepath ghc-lib-parser megaparsec - MemoTrie mtl syb text + deepseq Diff directory file-embed filepath ghc-lib-parser + megaparsec MemoTrie mtl syb text ]; executableHaskellDepends = [ base containers directory filepath ghc-lib-parser @@ -218691,10 +218753,8 @@ self: { }: mkDerivation { pname = "parsers-megaparsec"; - version = "0.1.0.1"; - sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8"; - revision = "1"; - editedCabalFile = "16a7h16lq27930l0hpa8z97b4p6cwrz3wdxs67mfxvz2ndngm87d"; + version = "0.1.0.2"; + sha256 = "1hrvj1cw1snyk0i1fjnrwnf2y3nm20ammdrk1iaiasfcw43azw9j"; libraryHaskellDepends = [ base fail megaparsec mtl parsers semigroups text transformers ]; @@ -223036,8 +223096,8 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.2.2.0"; - sha256 = "0lipsk7nn98ldmwn8y0r1mzyqal9p9wrcdlc5k9q93yds2s9bg71"; + version = "0.2.3.0"; + sha256 = "07bnq7kg37wlirfkgiyskpkzh7vkp3n2ilxkbj7mnl042ninfqi7"; libraryHaskellDepends = [ base cli-arguments phladiprelio-general-shared phonetic-languages-phonetics-basics rhythmic-sequences @@ -223081,8 +223141,8 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.3.2.0"; - sha256 = "0jfz08dkki4a6mzcchwinl6jam1bqjq1131kij2cf260amll51i8"; + version = "0.3.3.0"; + sha256 = "13wdcz0yma0088q2yqvcn7s22gbkk755rjf2cfw0b1320jx066sa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225576,8 +225636,8 @@ self: { pname = "pipes-safe"; version = "2.3.4"; sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; - revision = "3"; - editedCabalFile = "19w7pv6n2jzcibz32rwdavlbsl3k7pn8981w7sngwx2yr2fij8bd"; + revision = "4"; + editedCabalFile = "1p55qgg0ib05rvcrwpcnrg8dl0plaj9hkl6s7d47krlpmr8qsdx8"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -226692,6 +226752,8 @@ self: { pname = "plots"; version = "0.1.1.3"; sha256 = "1gkrwigv53vg1q96z56m86xf6z9g9w4jqaapf81rixqsww7hrbng"; + revision = "1"; + editedCabalFile = "0khcgsbl837rahz9qkq8fbdz9nrdbppqaxpdimp46aha4jbhkyqd"; libraryHaskellDepends = [ adjunctions base base-orphans colour containers data-default diagrams-core diagrams-lib directory distributive filepath @@ -232219,6 +232281,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "prettychart" = callPackage + ({ mkDerivation, async, base, box, bytestring, chart-svg + , containers, flatparse, formatn, lucid, mealy, numhask-space + , optics-core, profunctors, text, time, web-rep + }: + mkDerivation { + pname = "prettychart"; + version = "0.1.0"; + sha256 = "1vpw8jwsjyryz1sx1g79hc95sxjy8q5i4yig5f9xc58qy2cg6z1k"; + revision = "1"; + editedCabalFile = "0laddpy0xjdzdsd7iqc2b0h01dixs903yiwy3145pd0c251dxb4z"; + libraryHaskellDepends = [ + async base box bytestring chart-svg containers flatparse formatn + lucid mealy numhask-space optics-core profunctors text time web-rep + ]; + description = "Pretty print charts from ghci"; + license = lib.licenses.bsd3; + }) {}; + "prettyclass" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { @@ -234718,6 +234799,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "proquint" = callPackage + ({ mkDerivation, array, base, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "proquint"; + version = "0.1.0.0"; + sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; + license = "EUPL-1.2"; + }) {}; + "prosidy" = callPackage ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base , base-compat-batteries, binary, bytestring, containers, deepseq @@ -236904,27 +236998,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "2.1.0.12"; - sha256 = "12gk26br85spyl0pcdr71a0i3mq4cbb8qi6vwkmgx4k6hg7h43xl"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_13" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers @@ -236943,7 +237016,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -243515,17 +243587,6 @@ self: { }) {}; "ref-fd" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "ref-fd"; - version = "0.5"; - sha256 = "1r34xyyx0fyl1fc64n1hhk0m2s1l808kjb18dmj8w0y91w4ms6qj"; - libraryHaskellDepends = [ base stm transformers ]; - description = "A type class for monads with references using functional dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "ref-fd_0_5_0_1" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "ref-fd"; @@ -243534,7 +243595,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ref-mtl" = callPackage @@ -243666,6 +243726,24 @@ self: { license = lib.licenses.mit; }) {}; + "refined_0_8_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , hashable, mtl, QuickCheck, template-haskell, text, these-skinny + }: + mkDerivation { + pname = "refined"; + version = "0.8.1"; + sha256 = "0d971w7g6qcsczv3b4i4v5mjsfjv8ajm76vfvnxsszda5bq45bim"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions hashable mtl QuickCheck + template-haskell text these-skinny + ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Refinement types with static and runtime checking"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "refined-http-api-data" = callPackage ({ mkDerivation, base, http-api-data, refined, text }: mkDerivation { @@ -251726,8 +251804,8 @@ self: { pname = "rss"; version = "3000.2.0.7"; sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; - revision = "6"; - editedCabalFile = "1zhkfkvlbisk5qa7fccpwknblzk1m4kyyfcdhj436p2q5kx8dd8v"; + revision = "7"; + editedCabalFile = "0wkldbjhfyik5dv8rcgyb8w2q4nl4kbajdhrckc4a0d89dzmk3d0"; libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; @@ -253660,6 +253738,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_1_3_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lifted-async, microlens, microlens-th + , monad-control, monad-logger, mtl, optparse-applicative + , pretty-show, process, safe, safe-exceptions, stm + , string-interpolate, template-haskell, text, time, transformers + , transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.3.1"; + sha256 = "05x418al128vllrf5rcxl1asqm3lvviizgv3dhiw1pp1zppz4kk4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lifted-async + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lifted-async + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lifted-async + microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-hedgehog" = callPackage ({ mkDerivation, base, free, hedgehog, monad-control, mtl , safe-exceptions, sandwich, string-interpolate, text, time, vty @@ -253681,6 +253803,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-hedgehog_0_1_2_0" = callPackage + ({ mkDerivation, base, free, hedgehog, monad-control, mtl + , safe-exceptions, sandwich, string-interpolate, text, time, vty + , wl-pprint-annotated + }: + mkDerivation { + pname = "sandwich-hedgehog"; + version = "0.1.2.0"; + sha256 = "1vaf2paszycknjq4dl190vp8fc9rp7mxdi8m1ixj2nj8ymvsxvq6"; + libraryHaskellDepends = [ + base free hedgehog monad-control mtl safe-exceptions sandwich + string-interpolate text time vty wl-pprint-annotated + ]; + testHaskellDepends = [ + base free hedgehog monad-control mtl safe-exceptions sandwich + string-interpolate text time vty wl-pprint-annotated + ]; + description = "Sandwich integration with Hedgehog"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-quickcheck" = callPackage ({ mkDerivation, base, free, monad-control, mtl, QuickCheck , safe-exceptions, sandwich, text, time @@ -264737,14 +264881,14 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; - "simple-affine-space_0_2" = callPackage + "simple-affine-space_0_2_1" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, hlint, process , regex-posix }: mkDerivation { pname = "simple-affine-space"; - version = "0.2"; - sha256 = "1wxsbw1l5ynff3df6yvz22zwnnm77bhr67yccpkfsz9l9l566a3w"; + version = "0.2.1"; + sha256 = "1rnn4krcraygnmlph6wlk1r531cqy0c04qrsvdm3aw1m4jhbdrax"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base directory filepath hlint process regex-posix @@ -275289,8 +275433,8 @@ self: { pname = "static-canvas"; version = "0.2.0.3"; sha256 = "0jfp3nk9flzjw0qjkbh7rk7q0g6dsmgqb2xwrfmg5pnf13gj821p"; - revision = "1"; - editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7"; + revision = "2"; + editedCabalFile = "1xf89gl68zfs0dk2qgsycw620p2ibslc9x36zs0vj9mxxz371l9s"; libraryHaskellDepends = [ base double-conversion free mtl text ]; description = "DSL to generate HTML5 Canvas javascript"; license = lib.licenses.bsd3; @@ -275430,6 +275574,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "statistics_0_16_2_0" = callPackage + ({ mkDerivation, aeson, async, base, binary, data-default-class + , deepseq, dense-linear-algebra, erf, ieee754, math-functions + , mwc-random, parallel, primitive, QuickCheck, random, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector + , vector-algorithms, vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.16.2.0"; + sha256 = "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk"; + libraryHaskellDepends = [ + aeson async base binary data-default-class deepseq + dense-linear-algebra math-functions mwc-random parallel primitive + random vector vector-algorithms vector-binary-instances + vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf ieee754 math-functions + primitive QuickCheck tasty tasty-expected-failure tasty-hunit + tasty-quickcheck vector vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -277229,6 +277400,30 @@ self: { license = lib.licenses.mit; }) {}; + "streaming-commons_0_2_2_6" = callPackage + ({ mkDerivation, array, async, base, bytestring, deepseq, directory + , gauge, hspec, hspec-discover, network, process, QuickCheck + , random, stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.2.2.6"; + sha256 = "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"; + libraryHaskellDepends = [ + array async base bytestring directory network process random stm + text transformers unix zlib + ]; + testHaskellDepends = [ + array async base bytestring deepseq hspec network QuickCheck text + unix zlib + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; + description = "Common lower-level functions needed by various streaming data libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-concurrency" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming @@ -278450,6 +278645,8 @@ self: { pname = "string-interpolate"; version = "0.3.2.0"; sha256 = "1sdd472rvykrqkv76745vavpycvb0dzcaxs3yw9dfczaxaz16xws"; + revision = "1"; + editedCabalFile = "0crn9461yil03bh06z5dwii65sdq9gf7837qxfy5bxna2qwn0zz9"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -281478,8 +281675,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.13.0.2"; - sha256 = "01i6iv0m5g5rg2dqsqqf2x4fl7xbwsz999d9gsjll2l9q423a49l"; + version = "0.13.0.4"; + sha256 = "0v799zkqm6w0kvbi6hs6cdygcbsachq6m21hiv6kdyca2kyrkgvp"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers dlist envparse filepath MonadRandom mtl optparse-applicative path path-io @@ -281497,22 +281694,24 @@ self: { broken = true; }) {}; - "sydtest_0_13_0_4" = callPackage + "sydtest_0_14_0_0" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, dlist, envparse, filepath, MonadRandom , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck , quickcheck-io, random, random-shuffle, safe, safe-coloured-text - , safe-coloured-text-terminfo, stm, sydtest-discover, text, vector + , safe-coloured-text-terminfo, stm, svg-builder, sydtest-discover + , text, vector }: mkDerivation { pname = "sydtest"; - version = "0.13.0.4"; - sha256 = "0v799zkqm6w0kvbi6hs6cdygcbsachq6m21hiv6kdyca2kyrkgvp"; + version = "0.14.0.0"; + sha256 = "1pqzc1mir7pcpp5pdlz0qipn52ma9b86lgcdvagdqf30c8h5wdg9"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show QuickCheck quickcheck-io random random-shuffle safe - safe-coloured-text safe-coloured-text-terminfo stm text vector + safe-coloured-text safe-coloured-text-terminfo stm svg-builder text + vector ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text @@ -281619,6 +281818,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-hedgehog_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, hedgehog, stm, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-hedgehog"; + version = "0.4.0.0"; + sha256 = "0n3787yvni6s9ljrq1mcxybjq394nvik629v8absmfs69js679ih"; + libraryHaskellDepends = [ base containers hedgehog stm sydtest ]; + testHaskellDepends = [ base hedgehog sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "A Hedgehog companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-hedis" = callPackage ({ mkDerivation, base, bytestring, hedis, network, path, path-io , port-utils, sydtest, sydtest-discover, sydtest-typed-process @@ -281657,6 +281872,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-hspec_0_4_0_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm + , sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.4.0.0"; + sha256 = "0li8h3mh2s4ga8cpb0phaqyx6q1lw2w58b6yhs3s16a8cqh58k7x"; + libraryHaskellDepends = [ + base hspec-core mtl QuickCheck stm sydtest + ]; + testHaskellDepends = [ base hspec stm sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -290967,8 +291200,8 @@ self: { pname = "these-skinny"; version = "0.7.5"; sha256 = "1nbcfkjs7cn3gnyypxdf1gxm52gzqc3lqygdl8qrfgdk7cck6sbj"; - revision = "1"; - editedCabalFile = "1paqqcdbqr91gvvs0anq30pkdd37g70ql4v11lszl6dzjl6yy3d5"; + revision = "2"; + editedCabalFile = "158rp41bdzzz2hc17vn5c1j6llcmbirajv0hsq2d76j38nyh7d94"; libraryHaskellDepends = [ base deepseq ghc-prim ]; description = "A fork of the 'these' package without the dependency bloat"; license = lib.licenses.bsd3; @@ -293206,6 +293439,50 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "tinytools-vty" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base, bimap + , bytestring, clock, constraints-extras, containers, data-default + , dependent-map, dependent-sum, directory, extra, file-embed + , filepath, hspec, hspec-contrib, http-conduit, HUnit, ilist, lens + , mtl, optparse-applicative, primitive, ref-tf, reflex + , reflex-potatoes, reflex-test-host, reflex-vty, relude, semialign + , template-haskell, text, these, time, tinytools, vty + }: + mkDerivation { + pname = "tinytools-vty"; + version = "0.1.0.1"; + sha256 = "0f8jl45wz4wjsyb33q28fsbsic7r4qs3g37060c9iagkydnad8za"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bimap bytestring clock + constraints-extras containers data-default dependent-map + dependent-sum directory extra file-embed filepath http-conduit + ilist lens mtl optparse-applicative primitive ref-tf reflex + reflex-potatoes reflex-test-host reflex-vty relude semialign + template-haskell text these time tinytools vty + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bimap bytestring clock + constraints-extras containers data-default dependent-map + dependent-sum directory extra file-embed filepath http-conduit + ilist lens mtl optparse-applicative primitive ref-tf reflex + reflex-potatoes reflex-test-host reflex-vty relude semialign + template-haskell text these time tinytools vty + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bimap bytestring clock + constraints-extras containers data-default dependent-map + dependent-sum directory extra file-embed filepath hspec + hspec-contrib http-conduit HUnit ilist lens mtl + optparse-applicative primitive ref-tf reflex reflex-potatoes + reflex-test-host reflex-vty relude semialign template-haskell text + these time tinytools vty + ]; + description = "a terminal based unicode diagram editing tool"; + license = lib.licenses.bsd3; + }) {}; + "tip-haskell-frontend" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , geniplate-mirror, ghc, ghc-paths, ghc-simple, mtl @@ -301872,6 +302149,20 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "uniform-cmdLineArgs" = callPackage + ({ mkDerivation, base, monads-tf, optparse-applicative, uniformBase + }: + mkDerivation { + pname = "uniform-cmdLineArgs"; + version = "0.1.5.1"; + sha256 = "1jss4brx1pcillf13hrnf2gqv3n4db9wn543qz9wcrdyyvfn5nj5"; + libraryHaskellDepends = [ + base monads-tf optparse-applicative uniformBase + ]; + description = "a convenient handling of command line arguments"; + license = "GPL"; + }) {}; + "uniform-error" = callPackage ({ mkDerivation, base, data-default, HTF, safe, transformers , uniform-strings @@ -301959,8 +302250,8 @@ self: { }: mkDerivation { pname = "uniform-json"; - version = "0.1.5.1"; - sha256 = "1grhbm149zyzz6px9jdwl3a67gzw5lykwhjryy968dvz6bjk3yn1"; + version = "0.1.5.2"; + sha256 = "062bqzvlfi2zl014ykxv22kzkym6z0l6zdwqddq9mch27mpvr9y7"; libraryHaskellDepends = [ aeson aeson-pretty base lens lens-aeson monads-tf pretty-show uniformBase unordered-containers yaml @@ -301977,14 +302268,16 @@ self: { }) {}; "uniform-latex2pdf" = callPackage - ({ mkDerivation, base, process, silently, uniform-json, uniformBase + ({ mkDerivation, aeson, base, doclayout, doctemplates, process + , silently, uniform-json, uniform-pandoc, uniformBase }: mkDerivation { pname = "uniform-latex2pdf"; - version = "0.1.5.1"; - sha256 = "16v8mz7rav8clk1pz4i01wijkcf8iqj7sxsbqjr36a2bv4nc76ry"; + version = "0.1.5.2"; + sha256 = "0k49bn4dni7zmpbwviz435v4acdmwdm8a306cmvd74fg1s7hywrp"; libraryHaskellDepends = [ - base process silently uniform-json uniformBase + aeson base doclayout doctemplates process silently uniform-json + uniform-pandoc uniformBase ]; description = "convert a latex `tex` file to a pdf"; license = "GPL"; @@ -302008,15 +302301,16 @@ self: { }) {}; "uniform-pandoc" = callPackage - ({ mkDerivation, aeson, base, doclayout, doctemplates, pandoc - , uniform-json, uniformBase + ({ mkDerivation, aeson, base, bytestring, doclayout, doctemplates + , pandoc, uniform-json, uniformBase }: mkDerivation { pname = "uniform-pandoc"; - version = "0.1.5.1"; - sha256 = "0kyz6xv3fgwkn5cbi6h9yalx9yrnahb8mf6hiwiymi4881m4apna"; + version = "0.1.5.2"; + sha256 = "1bb9mrp71ppdppnh49vni7zhr53n2slhs5imzmvzjp3p0w6ss5h3"; libraryHaskellDepends = [ - aeson base doclayout doctemplates pandoc uniform-json uniformBase + aeson base bytestring doclayout doctemplates pandoc uniform-json + uniformBase ]; description = "handling of some pandoc stuff"; license = "GPL"; @@ -306565,8 +306859,8 @@ self: { pname = "vector"; version = "0.12.3.1"; sha256 = "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv"; - revision = "3"; - editedCabalFile = "0n8w54d931k5s46ls4n7w40bs0gb839ijli9w6b9am0k1s1yigxb"; + revision = "4"; + editedCabalFile = "19r3pz08wqrhkz2sx41jm91d914yk4sndrrvls9wgdvi50qiy51r"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -310871,6 +311165,27 @@ self: { broken = true; }) {}; + "wai-token-bucket-ratelimiter" = callPackage + ({ mkDerivation, async, base, bytestring, clock, criterion + , hashable, hspec, hspec-discover, http-client, http-types + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "wai-token-bucket-ratelimiter"; + version = "0.1.0.0"; + sha256 = "1rgg6r3wym7l13b79yy0davl1isibrmfvn7yv4h6wv65s4iwvrjm"; + libraryHaskellDepends = [ + base clock hashable http-types unordered-containers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-client http-types wai warp + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ async base criterion ]; + description = "A request rate limiting middleware using token buckets"; + license = lib.licenses.asl20; + }) {}; + "wai-transformers" = callPackage ({ mkDerivation, base, exceptions, extractable-singleton , monad-control-aligned, transformers, wai, wai-websockets @@ -312219,24 +312534,24 @@ self: { , containers, cryptonite, directory, file-embed, filepath, hashable , hourglass, hspec, hspec-expectations-json, jose, lens, memory , monad-time, mtl, pem, QuickCheck, quickcheck-instances, serialise - , singletons, text, time, unordered-containers, uuid, validation - , x509, x509-store, x509-validation + , singletons, text, these, time, unordered-containers, uuid + , validation, x509, x509-store, x509-validation }: mkDerivation { pname = "webauthn"; - version = "0.5.0.1"; - sha256 = "1nlcf3fgx4bp4pghbr5yy161sg1gkzxa1j0699r04dnw4i8qw9d0"; + version = "0.6.0.0"; + sha256 = "0xad64jl8byjqbmz3l38f87lp7ixf8il12zlyvkp70mcd4bi0ndr"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite file-embed hashable hourglass jose lens memory monad-time mtl - serialise singletons text time unordered-containers uuid validation - x509 x509-store x509-validation + serialise singletons text these time unordered-containers uuid + validation x509 x509-store x509-validation ]; testHaskellDepends = [ aeson asn1-encoding base bytestring containers cryptonite directory filepath hourglass hspec hspec-expectations-json memory mtl pem - QuickCheck quickcheck-instances serialise singletons text + QuickCheck quickcheck-instances serialise singletons text these unordered-containers uuid validation x509 x509-store ]; description = "Relying party (server) implementation of the WebAuthn 2 specification"; @@ -312374,6 +312689,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "webdriver_0_10_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, call-stack, data-default-class, directory + , directory-tree, exceptions, filepath, http-client, http-types + , lifted-base, monad-control, network, network-uri, scientific + , temporary, text, time, transformers, transformers-base + , unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.10.0.1"; + sha256 = "1mwdn96f5mn8zpbh0rh8f88dh4r8mrizd44hn5n0z2gnj0dipfkp"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring call-stack + data-default-class directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -314152,6 +314491,32 @@ self: { mainProgram = "utf8-troubleshoot"; }) {}; + "with-utf8_1_0_2_4" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix + }: + mkDerivation { + pname = "with-utf8"; + version = "1.0.2.4"; + sha256 = "0qpz8b5rw5p77jwcrzknqjkidkrfjlw5zh3r92giw35yzicmx7am"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe-exceptions text ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions text th-env + ]; + testHaskellDepends = [ + base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog + tasty-hunit temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Get your IO right on the first try"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "utf8-troubleshoot"; + }) {}; + "withdependencies" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors @@ -318030,40 +318395,6 @@ self: { inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage - ({ mkDerivation, base, containers, data-default-class, directory - , filepath, mtl, process, QuickCheck, quickcheck-classes, setlocale - , time, transformers, unix, X11 - }: - mkDerivation { - pname = "xmonad"; - version = "0.17.1"; - sha256 = "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8"; - revision = "2"; - editedCabalFile = "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default-class directory filepath mtl process - setlocale time transformers unix X11 - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers QuickCheck quickcheck-classes X11 - ]; - postInstall = '' - install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1 - install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs - ''; - description = "A tiling window manager"; - license = lib.licenses.bsd3; - mainProgram = "xmonad"; - maintainers = [ - lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti - ]; - }) {}; - - "xmonad_0_17_2" = callPackage ({ mkDerivation, base, containers, data-default-class, directory , filepath, mtl, process, QuickCheck, quickcheck-classes, setlocale , time, transformers, unix, X11 @@ -318088,7 +318419,6 @@ self: { ''; description = "A tiling window manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan @@ -318659,26 +318989,6 @@ self: { }) {xslt = null;}; "xss-sanitize" = callPackage - ({ mkDerivation, attoparsec, base, containers, css-text, hspec - , HUnit, network-uri, tagsoup, text, utf8-string - }: - mkDerivation { - pname = "xss-sanitize"; - version = "0.3.7.1"; - sha256 = "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h"; - libraryHaskellDepends = [ - attoparsec base containers css-text network-uri tagsoup text - utf8-string - ]; - testHaskellDepends = [ - attoparsec base containers css-text hspec HUnit network-uri tagsoup - text utf8-string - ]; - description = "sanitize untrusted HTML to prevent XSS attacks"; - license = lib.licenses.bsd2; - }) {}; - - "xss-sanitize_0_3_7_2" = callPackage ({ mkDerivation, attoparsec, base, containers, css-text, hspec , HUnit, network-uri, tagsoup, text, utf8-string }: @@ -318696,7 +319006,6 @@ self: { ]; description = "sanitize untrusted HTML to prevent XSS attacks"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "xstatic" = callPackage @@ -320742,6 +321051,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-oauth2_0_7_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, mtl, safe-exceptions, text, transformers, unliftio + , uri-bytestring, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.7.1.0"; + sha256 = "112xdc5i1r1vfi95ws1jlldy6q9kv1cv6h26l3ahmmr8rqw3rz4h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + transformers unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-oidc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html, broch , bytestring, classy-prelude, classy-prelude-yesod, containers From 632d358c647a48bafd6ab322239b78f30c2e93f8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 8 Apr 2023 00:24:31 +0200 Subject: [PATCH 10/62] maintainers/scripts/haskell: Add reference to manual to PR template --- maintainers/scripts/haskell/merge-and-open-pr.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 9e6ebafaccc8..044151305e35 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -112,6 +112,8 @@ The short version is this: * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. * If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) +More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell). + --- This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. From 48f8dbfef31e577678484ceeb40df0bfb1a243dc Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Sat, 8 Apr 2023 17:52:21 -0700 Subject: [PATCH 11/62] nrg2iso: compile on Darwin nrg2iso's build scripts are hard-coded to use GCC. This prevents nrg2iso from working on Darwin/macOS. Teach nrg2iso's build scripts to use whatever compiler is installed, not GCC specifically. This allows nrg2iso to build using Clang on macOS. --- pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch | 11 +++++++++++ pkgs/tools/cd-dvd/nrg2iso/default.nix | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch diff --git a/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch b/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch new file mode 100644 index 000000000000..72752723470c --- /dev/null +++ b/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch @@ -0,0 +1,11 @@ +Support building with compilers such as Clang. + +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + all: nrg2iso.c +- gcc nrg2iso.c -o nrg2iso ++ cc nrg2iso.c -o nrg2iso + + clean: + rm -f nrg2iso diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index c0f74b8cddc7..fdde54b596f1 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-O+NqQWdY/BkQRztJqNrfKiqj1R8ZdhlzNrwXS8HjBuU="; }; + patches = [ ./c-compiler.patch ]; + installPhase = '' mkdir -pv $out/bin/ cp -v nrg2iso $out/bin/nrg2iso @@ -18,6 +20,6 @@ stdenv.mkDerivation rec { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } From 72f71112081a66aec14448c448973a914efc1df9 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Tue, 29 Nov 2022 15:42:30 -0500 Subject: [PATCH 12/62] pgloader: use latest SBCL, not pinned to 2.2.6 --- pkgs/development/tools/pgloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index ab2e047264eb..dce892451c1c 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }: +{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; version = "3.6.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ git makeWrapper ]; - buildInputs = [ sbcl_2_2_6 cacert sqlite freetds libzip curl openssl ]; + buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; From 70bcbfe4f7eea20eadb4928292f9782a509378d3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Apr 2023 15:34:10 +0200 Subject: [PATCH 13/62] haskellPackages.cabal-install-parsers: use Cabal-syntax 3.10 Current versions of cabal-install-parsers have a lower bound of >= 3.10 on Cabal-syntax which has been obscured by the jailbreak we still need to apply for the /lower/ bound of aeson. --- 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 8ceae6a45189..03f14b56f8b8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1359,7 +1359,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_1_0; })); cabal-install-parsers_0_4_5 = doDistribute ( dontCheck ( From 049eb388ebaadc7905a7177f5df28788eed43a35 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Apr 2023 15:36:29 +0200 Subject: [PATCH 14/62] haskellPackages.haskell-ci: adjust to 0.16 - Drop patch which was a backport of a now released upstream change. - Drop scope overrides where upstream constraints are compatible with LTS-20. haskellPackages.cabal-install-parsers_0_4_5: remove at 0.4.5 No longer necessary for haskell-ci which is why we had it. --- .../haskell-modules/configuration-common.nix | 18 ++----- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 29 ---------- ...arse-applicative-0.17-ShellCheck-0.8.patch | 54 ------------------- 4 files changed, 3 insertions(+), 99 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 03f14b56f8b8..5e5b89b8ae12 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1361,13 +1361,6 @@ self: super: { cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { Cabal-syntax = self.Cabal-syntax_3_10_1_0; })); - cabal-install-parsers_0_4_5 = doDistribute ( - dontCheck ( - super.cabal-install-parsers_0_4_5.override { - Cabal = self.Cabal_3_6_3_0; - } - ) - ); # 2022-03-12: Pick patches from master for compat with Stackage Nightly # 2022-12-07: Lift bounds to allow dependencies shipped with LTS-20 @@ -2067,14 +2060,9 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - # 2022-01-16 haskell-ci needs Cabal 3.6 - haskell-ci = (appendPatches [ - # Allow building with optparse-applicative 0.17* and ShellCheck 0.8.0 - ./patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch - ] super.haskell-ci).overrideScope (self: super: { - Cabal = self.Cabal_3_6_3_0; - cabal-install-parsers = self.cabal-install-parsers_0_4_5; - ShellCheck = self.ShellCheck_0_8_0; + # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 + haskell-ci = super.haskell-ci.overrideScope (self: super: { + Cabal-syntax = self.Cabal-syntax_3_10_1_0; }); large-hashable = lib.pipe (super.large-hashable.override { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5b1edb725a68..464bbf27c58d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -68,7 +68,6 @@ extra-packages: - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 - brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6f04b00479d2..d8ebe5bd9f6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53240,35 +53240,6 @@ self: { broken = true; }) {}; - "cabal-install-parsers_0_4_5" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , binary, binary-instances, bytestring, Cabal, containers - , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko - , network-uri, parsec, pretty, tar, tasty, tasty-golden - , tasty-hunit, text, time, transformers, tree-diff - }: - mkDerivation { - pname = "cabal-install-parsers"; - version = "0.4.5"; - sha256 = "0gdqr7ib22h6qfvkv179xm4s2lw6fj62y7hj5lg53zjkc7y8791j"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary binary-instances bytestring - Cabal containers cryptohash-sha256 deepseq directory filepath lukko - network-uri parsec pretty tar text time transformers - ]; - testHaskellDepends = [ - ansi-terminal base base16-bytestring bytestring Cabal containers - directory filepath pretty tar tasty tasty-golden tasty-hunit - tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring Cabal containers criterion directory filepath - ]; - description = "Utilities to work with cabal-install files"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - }) {}; - "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal-syntax, containers diff --git a/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch b/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch deleted file mode 100644 index c1e1663627f7..000000000000 --- a/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0cc6f0f8de1776d0b5851459d22a0997dfd735ce Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus -Date: Wed, 25 May 2022 14:09:49 +0300 -Subject: [PATCH] Use ShellCheck-0.8.0 and optparse-applicative-0.17 - -Adapted from 0cc6f0f8de1776d0b5851459d22a0997dfd735ce to apply on top of -haskell-ci-0.14.3. - -Co-Authored-By: sternenseemann - ---- - haskell-ci.cabal | 4 ++-- - src/HaskellCI/GitHub.hs | 7 ++++--- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/haskell-ci.cabal b/haskell-ci.cabal -index 273bd422..6848402c 100644 ---- a/haskell-ci.cabal -+++ b/haskell-ci.cabal -@@ -167,14 +167,14 @@ library haskell-ci-internal - , ini ^>=0.4.1 - , lattices ^>=2 - , network-uri ^>=2.6.1.0 -- , optparse-applicative ^>=0.16.1.0 -+ , optparse-applicative ^>=0.17.0.0 - , temporary ^>=1.3 - , unordered-containers ^>=0.2.10.0 - , zinza ^>=0.2 - - -- ShellCheck. Would need newer transformers for older GHC - if flag(shellcheck) -- build-depends: ShellCheck ==0.7.2 -+ build-depends: ShellCheck ==0.8.0 - - executable haskell-ci - main-is: Main.hs -diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs -index f1a402e6..a2c6e4f6 100644 ---- a/src/HaskellCI/GitHub.hs -+++ b/src/HaskellCI/GitHub.hs -@@ -653,9 +653,10 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do - setup hvrppa ghcup - | allGHCUP = traverse_ liftSh ghcup - | not anyGHCUP = traverse_ liftSh hvrppa -- -- 2192: ${{ ...}} will match (ShellCheck think it doesn't) -- -- 2129: individual redirects -- | otherwise = sh' [2193, 2129] $ unlines $ -+ -- SC2192: ${{ ...}} will match (ShellCheck think it doesn't) -+ -- SC2129: individual redirects -+ -- SC2296: Parameter expansions can't start with {. Double check syntax. -- ${{ }} in YAML templating. -+ | otherwise = sh' [2193, 2129, 2296] $ unlines $ - [ "if [ \"${{ matrix.setup-method }}\" = ghcup ]; then" - ] ++ - [ " " ++ shToString s From 63a6b34b05d80c184034ed3407470baecdafcbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Sun, 9 Apr 2023 15:46:15 +0200 Subject: [PATCH 15/62] geoclue2: 2.6.0 -> 2.7.0 --- ...d-option-for-installation-sysconfdir.patch | 48 +++++++++++-------- .../development/libraries/geoclue/default.nix | 10 ++-- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch index 3e2ee954c8a1..832ae945aa2c 100644 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -1,8 +1,16 @@ -diff --git a/data/meson.build b/data/meson.build -index a1fc61f..7c03882 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -7,7 +7,7 @@ if get_option('enable-backend') +diff --git i/data/meson.build w/data/meson.build +index 6ac2a11..73f433b 100644 +--- i/data/meson.build ++++ w/data/meson.build +@@ -1,6 +1,6 @@ + if get_option('enable-backend') + conf = configuration_data() +- conf.set('sysconfdir', sysconfdir) ++ conf.set('sysconfdir', sysconfdir_install) + + if get_option('demo-agent') + conf.set('demo_agent', 'geoclue-demo-agent;') +@@ -8,7 +8,7 @@ if get_option('enable-backend') conf.set('demo_agent', '') endif @@ -11,16 +19,16 @@ index a1fc61f..7c03882 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -16,7 +16,7 @@ if get_option('enable-backend') +@@ -17,7 +17,7 @@ if get_option('enable-backend') conf = configuration_data() conf.set('libexecdir', libexecdir) conf.set('dbus_srv_user', get_option('dbus-srv-user')) - conf.set('sysconfdir', sysconfdir) + conf.set('sysconfdir', sysconfdir_install) - service_dir = join_paths(datadir, 'dbus-1', 'system-services') - configure_file(output: 'org.freedesktop.GeoClue2.service', -@@ -33,7 +33,7 @@ if get_option('enable-backend') + confd_dir = join_paths(conf_dir, 'conf.d') + install_emptydir(confd_dir) +@@ -37,7 +37,7 @@ if get_option('enable-backend') # DBus Service policy file dbus_service_dir = get_option('dbus-sys-dir') if dbus_service_dir == '' @@ -29,10 +37,10 @@ index a1fc61f..7c03882 100644 endif configure_file(output: 'org.freedesktop.GeoClue2.conf', input: 'org.freedesktop.GeoClue2.conf.in', -diff --git a/demo/meson.build b/demo/meson.build +diff --git i/demo/meson.build w/demo/meson.build index 1427fbe..2623f16 100644 ---- a/demo/meson.build -+++ b/demo/meson.build +--- i/demo/meson.build ++++ w/demo/meson.build @@ -54,7 +54,7 @@ if get_option('demo-agent') install_dir: desktop_dir) @@ -42,10 +50,10 @@ index 1427fbe..2623f16 100644 meson.add_install_script('install-file.py', desktop_file.full_path(), autostart_dir) -diff --git a/meson.build b/meson.build -index 8aa5c31..b011879 100644 ---- a/meson.build -+++ b/meson.build +diff --git i/meson.build w/meson.build +index 220ae2b..dbf6458 100644 +--- i/meson.build ++++ w/meson.build @@ -12,7 +12,11 @@ gclue_api_version='2.0' datadir = join_paths(get_option('prefix'), get_option('datadir')) includedir = join_paths(get_option('prefix'), get_option('includedir')) @@ -61,17 +69,17 @@ index 8aa5c31..b011879 100644 header_dir = 'libgeoclue-' + gclue_api_version @@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') - conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/') + conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/') conf.set_quoted('LOCALEDIR', localedir) -conf.set_quoted('SYSCONFDIR', sysconfdir) +conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key')) conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source')) conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source')) -diff --git a/meson_options.txt b/meson_options.txt +diff --git i/meson_options.txt w/meson_options.txt index 5b8c42d..945dfd5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt +--- i/meson_options.txt ++++ w/meson_options.txt @@ -40,6 +40,9 @@ option('systemd-system-unit-dir', option('dbus-srv-user', type: 'string', value: 'root', diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 519becfc6326..4bad33000c06 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -12,7 +12,7 @@ , docbook_xml_dtd_412 , glib , json-glib -, libsoup +, libsoup_3 , libnotify , gdk-pixbuf , modemmanager @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.6.0"; + version = "2.7.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "geoclue"; repo = "geoclue"; rev = version; - hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4="; + hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc="; }; patches = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib json-glib - libsoup + libsoup_3 avahi gobject-introspection ] ++ lib.optionals withDemoAgent [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin mimame ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2Plus; }; From 4f4bfa9b96898591a0115ecd7e661305e8e3199b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Apr 2023 16:08:38 +0200 Subject: [PATCH 16/62] git-annex: update sha256 for 10.20230407 --- 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 5e5b89b8ae12..ccbeea1ac3d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -284,7 +284,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 = "sha256-fZUQ/3q8w6BkFZRaezT7rpKQtAEGBR5qEc4rMm9I36c="; + sha256 = "0mz1b3vnschsndv42787mm6kybpb2yskkdss3rcm7xc6jjh815ik"; # 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 7493ac348a23ca27386acb1800da42abdac078ce Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 10 Apr 2023 15:02:31 -0400 Subject: [PATCH 17/62] sbcl: remove old versions, leave 2.1.9 for CLPM --- pkgs/development/compilers/sbcl/2.x.nix | 81 +------------------------ pkgs/development/tools/clpm/default.nix | 10 ++- pkgs/top-level/all-packages.nix | 45 ++------------ 3 files changed, 11 insertions(+), 125 deletions(-) diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index 4fcccbf97041..437e2e90562d 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -14,50 +14,11 @@ let versionMap = { - "2.0.8" = { - sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390"; - }; - - "2.0.9" = { - sha256 = "17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4"; - }; - - "2.1.1" = { - sha256 = "15wa66sachhzgvg5n35vihmkpasg100lh561c1d1bdrql0p8kbd9"; - }; - - "2.1.2" = { - sha256 = "sha256:02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp"; - }; - + # Only kept around for BCLM. Remove once unneeded there. "2.1.9" = { sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - "2.1.10" = { - sha256 = "0f5ihj486m7ghh3nc0jlnqa656sbqcmhdv32syz2rjx5b47ky67b"; - }; - - "2.1.11" = { - sha256 = "1zgypmn19c58pv7j33ga7m1l7lzghj70w3xbybpgmggxwwflihdz"; - }; - - "2.2.4" = { - sha256 = "sha256-/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI="; - }; - - "2.2.6" = { - sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA="; - }; - - "2.2.9" = { - sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI="; - }; - - "2.2.10" = { - sha256 = "sha256-jMPDqHYSI63vFEqIcwsmdQg6Oyb6FV1wz5GruTXpCDM="; - }; - "2.2.11" = { sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8="; }; @@ -81,44 +42,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo ]; buildInputs = lib.optionals coreCompression [ zstd ]; - patches = lib.optional - (lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8") - (fetchpatch { - # Fix segfault on ARM when reading large core files - url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch"; - sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv"; - }) - ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.9") [ - # Fix included in SBCL trunk since 2.2.9: - # https://bugs.launchpad.net/sbcl/+bug/1980570 - (fetchpatch { - name = "darwin-fno-common.patch"; - url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch"; - sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij"; - }) - ] ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.0") [ - # Fix -fno-common on arm64 - (fetchpatch { - name = "arm64-fno-common.patch"; - url = "https://github.com/sbcl/sbcl/commit/ac3739eae36de92feffef5bb9b4b4bd93f6c4942.patch"; - sha256 = "1kxg0ng7d465rk5v4biikrzaps41x4n1v4ygnb5qh4f5jzkbms8y"; - }) - ] ++ lib.optionals (version == "2.2.6") [ - # Take contrib blocklist into account for doc generation. This fixes sbcl - # build on aarch64, because the docs Makefile tries to require sb-simd, - # which is blocked in that platform. - (fetchpatch { - url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch"; - sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk="; - }) - ] ++ lib.optionals (version == "2.2.10") [ - # hard-coded /bin/cat to just ‘cat’, trusting the PATH - (fetchpatch { - url = "https://github.com/sbcl/sbcl/commit/8ed662fbfeb5dde35eb265f390b55b01f79f70c1.patch"; - sha256 = "sha256-2aqb13AFdw9KMf8KQ9yj1HVxgoFWZ9xWmnoDdbRSLy4="; - }) - ]; - + # There are no patches necessary for the currently enabled versions, but this + # code is left in place for the next potential patch. postPatch = '' echo '"${version}.nixos"' > version.lisp-expr diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index 8930815afdee..4fb1bbf851e9 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -4,7 +4,9 @@ , wrapLisp # Broken on newer versions: # https://gitlab.common-lisp.net/clpm/clpm/-/issues/51 -, sbcl_2_0_8 +# Once that bug is fixed, replace this with regular ‘sbcl’ and remove all +# references to sbcl 2.1.9 from nixpkgs, including from sbcl/2.x.nix. +, _sbcl_2_1_9 , openssl }: @@ -19,10 +21,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-UhaLmbdsIPj6O+s262HUMxuz/5t43JR+TlOjq8Y2CDs="; }; - buildInputs = [ - sbcl_2_0_8 - ]; - propagatedBuildInputs = [ openssl ]; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { # ld to complaing about `impure path used in link`. export HOME=$TMP - sbcl --script scripts/build-release.lisp + ${_sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26467839117b..ac986e6b12bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24570,50 +24570,13 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_0_8 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.8"; }; - faslExt = "fasl"; - }; - sbcl_2_0_9 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.0.9"; }; - faslExt = "fasl"; - }; - sbcl_2_1_1 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.1"; }; - faslExt = "fasl"; - }; - sbcl_2_1_2 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.2"; }; - faslExt = "fasl"; - }; - sbcl_2_1_9 = wrapLisp { + # This is a deprecated derivation, marked internal to avoid third party + # packages depending on it. It is used for CLPM only, and will be removed + # soon. + _sbcl_2_1_9 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.9"; }; faslExt = "fasl"; }; - sbcl_2_1_10 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.10"; }; - faslExt = "fasl"; - }; - sbcl_2_1_11 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.11"; }; - faslExt = "fasl"; - }; - sbcl_2_2_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.4"; }; - faslExt = "fasl"; - }; - sbcl_2_2_6 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.6"; }; - faslExt = "fasl"; - }; - sbcl_2_2_9 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.9"; }; - faslExt = "fasl"; - }; - sbcl_2_2_10 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.10"; }; - faslExt = "fasl"; - }; sbcl_2_2_11 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; }; faslExt = "fasl"; From 80673bd4119b4f56313a2bcddc727fe8fa0fd82d Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Mon, 10 Apr 2023 15:03:12 -0400 Subject: [PATCH 18/62] =?UTF-8?q?clpm:=20do=20fixup,=20just=20don=E2=80=99?= =?UTF-8?q?t=20strip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Less invasive change to the default build process, with the same result. --- pkgs/development/tools/clpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index 4fb1bbf851e9..06623538a3bc 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # fixupPhase results in fatal error in SBCL, `Can't find sbcl.core` - dontFixup = true; + # Stripping binaries results in fatal error in SBCL, `Can't find sbcl.core` + dontStrip = true; meta = with lib; { description = "Common Lisp Package Manager"; From a4c773993a41a0c31d04a2c2d4aba71a64178711 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sun, 9 Apr 2023 18:37:23 -0400 Subject: [PATCH 19/62] Add new maintainer: hraban --- maintainers/maintainer-list.nix | 6 ++++++ maintainers/team-list.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4cd3901e135..8339bbd0739d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6230,6 +6230,12 @@ githubId = 53281855; name = "hqurve"; }; + hraban = { + email = "hraban@0brg.net"; + github = "hraban"; + githubId = 137852; + name = "Hraban Luyat"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 34f4576054ee..88dbdd4dfccb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -431,6 +431,7 @@ with lib.maintainers; { lukego nagy uthar + hraban ]; githubTeams = [ "lisp" From d3ddefde9baf4c7d34b7d3ba2ee918b9c8b0691f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 10 Apr 2023 23:02:29 +0100 Subject: [PATCH 20/62] glusterfs: 10.3 -> 11 --- pkgs/tools/filesystems/glusterfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index ccaabf5f2841..1328f5468ed7 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "10.3"; + version = "11.0"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2+zdEbvXwfjAyeWpy0TAWRE0kvqSUqebmRyuhdfzYd0="; + sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI="; }; inherit buildInputs propagatedBuildInputs; From 05ef28cdae7fd8eddeb70696cea2202b6fcfe984 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Apr 2023 03:52:14 +0000 Subject: [PATCH 21/62] libatomic_ops: 7.6.14 -> 7.8.0 --- pkgs/development/libraries/libatomic_ops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 88d4464c4a0a..ae15c6236aa2 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libatomic_ops"; - version = "7.6.14"; + version = "7.8.0"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "sha256-OQ8kTUJHFHNbcFDQVlZ2FbO48pAIpmPCYvtUjxgC0pI="; + sha256 = "sha256-FWdudnThG9paflCnP02efWBFInG4rPb9Oacf79+J+jE="; }; outputs = [ "out" "dev" "doc" ]; From bf30644a3d9d5aeb6b4c145bbb2639d454484069 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 11 Apr 2023 12:44:52 +0800 Subject: [PATCH 22/62] qt6.qtModule: drop fixup handlings As they are either already part of the qtbase setupHook, or no longer required as we are building qt components with cmake. --- .../libraries/qt-6/modules/qtwebengine.nix | 4 +- pkgs/development/libraries/qt-6/qtModule.nix | 67 ++++--------------- 2 files changed, 15 insertions(+), 56 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 22d1e497f4ff..a8f69a5659eb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -226,9 +226,9 @@ qtModule { export NINJAFLAGS="-j$NIX_BUILD_CORES" ''; - postInstall = '' + postFixup = '' # This is required at runtime - mkdir $out/libexec + mkdir -p $out/libexec mv $dev/libexec/QtWebEngineProcess $out/libexec ''; diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 4a149108e077..8efbfdece4c3 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, perl, cmake, ninja, writeText, qtbase, qmake, srcs, patches ? [ ] }: +{ lib +, stdenv +, cmake +, ninja +, perl +, srcs +, patches ? [ ] +}: args: @@ -11,68 +18,20 @@ stdenv.mkDerivation (args // { inherit pname version src; patches = args.patches or patches.${pname} or [ ]; - buildInputs = args.buildInputs or [ ]; - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ - perl - cmake - ninja - qmake - ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); - preHook = '' . ${./hooks/move-qt-dev-tools.sh} - . ${./hooks/fix-qt-builtin-paths.sh} ''; + buildInputs = args.buildInputs or [ ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ]; + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); + outputs = args.outputs or [ "out" "dev" ]; dontWrapQtApps = args.dontWrapQtApps or true; - postInstall = '' - if [ ! -z "$dev" ]; then - mkdir "$dev" - for dir in libexec mkspecs - do - moveToOutput "$dir" "$dev" - done - fi - fixQtBuiltinPaths $out/lib "*.pr?" - ${args.postInstall or ""} - ''; - - preConfigure = args.preConfigure or "" + '' - fixQtBuiltinPaths . '*.pr?' - '' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0) - # Note: We use ${version%%-*} to remove any tag from the end of the version - # string. Version tags are added by Nixpkgs maintainers and not reflected in - # the source version. - '' - if [[ -z "$dontCheckQtModuleVersion" ]] \ - && grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \ - && ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null - then - echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf" - echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs" - exit 1 - fi - - if [[ -z "$dontSyncQt" && -f sync.profile ]]; then - # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs - # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin - ${lib.getDev qtbase}/libexec/syncqt.pl -version "''${version%%-*}" - fi - ''; postFixup = '' - if [ -d "''${!outputDev}/lib/pkgconfig" ]; then - find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do - sed -i "$pc" \ - -e "/^prefix=/ c prefix=''${!outputLib}" \ - -e "/^exec_prefix=/ c exec_prefix=''${!outputBin}" \ - -e "/^includedir=/ c includedir=''${!outputDev}/include" - done - fi - + moveToOutput "libexec" "''${!outputDev}" moveQtDevTools '' + args.postFixup or ""; From 1cf3cca8c020583490f83d6b2560f30c9c1c07fa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 11 Apr 2023 13:58:02 +0800 Subject: [PATCH 23/62] qt6: move all qmake related files to dev output --- .../libraries/qt-6/hooks/qtbase-setup-hook.sh | 8 +++++--- pkgs/development/libraries/qt-6/modules/qtbase.nix | 14 ++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 613b42fc97e9..16d9f31dbadf 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -58,7 +58,9 @@ else # Only set up Qt once. local doc="${!outputDoc}" local lib="${!outputLib}" - moveToOutput "mkspecs" "$dev" + moveToOutput "mkspecs" "$dev" + moveToOutput "modules" "$dev" + moveToOutput "lib/*.prl" "$dev" if [ -d "$dev/mkspecs/modules" ]; then fixQtModulePaths "$dev/mkspecs/modules" @@ -68,8 +70,8 @@ else # Only set up Qt once. fixQtBuiltinPaths "$dev/mkspecs" '*.pr?' fi - if [ -d "$lib" ]; then - fixQtBuiltinPaths "$lib" '*.pr?' + if [ -d "$dev/lib" ]; then + fixQtBuiltinPaths "$dev/lib" '*.pr?' fi } if [ -z "${dontPatchMkspecs-}" ]; then diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index e71b0a7613d9..3a4e6d8c8901 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -233,10 +233,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postInstall = '' - moveToOutput "mkspecs" "$dev" - ''; - devTools = [ "libexec/moc" "libexec/rcc" @@ -264,10 +260,12 @@ stdenv.mkDerivation rec { ]; postFixup = '' - # Don't retain build-time dependencies like gdb. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - fixQtModulePaths "''${!outputDev}/mkspecs/modules" - fixQtBuiltinPaths "''${!outputDev}" '*.pr?' + moveToOutput "mkspecs" "$dev" + moveToOutput "modules" "$dev" + moveToOutput "lib/*.prl" "$dev" + + fixQtModulePaths "$dev/mkspecs/modules" + fixQtBuiltinPaths "$dev" '*.pr?' # Move development tools to $dev moveQtDevTools From 255a6f44f577d247701d721d7059a443ce17ac63 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Apr 2023 11:01:06 +0200 Subject: [PATCH 24/62] haskellPackages.webauthn: disable test due to missing data --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ccbeea1ac3d1..4fdb2108fae0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2542,6 +2542,10 @@ self: super: { commonmark-extensions = lself.commonmark-extensions_0_2_3_2; }); + # Test files missing from sdist + # https://github.com/tweag/webauthn/issues/166 + webauthn = dontCheck super.webauthn; + # doctest <0.19 polysemy = doJailbreak super.polysemy; From 5f9381e696679d8aee2d2d3c05f950fc7206771f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Apr 2023 11:02:16 +0200 Subject: [PATCH 25/62] haskellPackages.wai-token-bucket-ratelimiter: relax bound on hspec --- 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 4fdb2108fae0..ef49ab976244 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2546,6 +2546,11 @@ self: super: { # https://github.com/tweag/webauthn/issues/166 webauthn = dontCheck super.webauthn; + # Too strict lower bound on hspec + wai-token-bucket-ratelimiter = + assert lib.versionOlder self.hspec.version "2.10"; + doJailbreak super.wai-token-bucket-ratelimiter; + # doctest <0.19 polysemy = doJailbreak super.polysemy; From c258006ca8c479b8e5ed5fc46078d1ab19b17349 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Apr 2023 11:15:33 +0200 Subject: [PATCH 26/62] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1793378](https://hydra.nixos.org/eval/1793378) of nixpkgs commit [e2236d3](https://github.com/NixOS/nixpkgs/commits/e2236d303f31485fed8f4e0886337c58d854f7df) as of 2023-04-11 09:06 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 3 +++ .../configuration-hackage2nix/transitive-broken.yaml | 7 +++++++ pkgs/development/haskell-modules/hackage-packages.nix | 11 +++++++++++ 3 files changed, 21 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 4778afb7451c..ce375bfe0839 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1546,6 +1546,7 @@ broken-packages: - fixer - fixfile - fixie + - fix-imports # dependency missing in job https://hydra.nixos.org/build/215306368 at 2023-04-11 - fix-symbols-gitit - fizzbuzz - fizzbuzz-as-a-service @@ -1707,6 +1708,7 @@ broken-packages: - generic-match - generic-maybe - generic-override + - generic-persistence # failure in job https://hydra.nixos.org/build/215303659 at 2023-04-11 - generic-pretty - generic-pretty-instances - generic-records @@ -4243,6 +4245,7 @@ broken-packages: - Proper - properties - property-list + - proquint # failure in job https://hydra.nixos.org/build/215308028 at 2023-04-11 - prosidy - prosper - proteaaudio diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index bd64ae0c9253..5c9de5b9956f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -330,6 +330,7 @@ dont-distribute-packages: - RNAlien - RNAwolf - Ranka + - ReplaceUmlaut - RollingDirectory - S3 - SBench @@ -1145,6 +1146,7 @@ dont-distribute-packages: - cuckoo - cv-combinators - cypher + - daino - dapi - darcs-benchmark - darcs-beta @@ -2168,6 +2170,7 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph + - hix - hjsonschema - hjugement-cli - hlcm @@ -3189,6 +3192,7 @@ dont-distribute-packages: - prefork - prelate - presto-hdbc + - prettychart - preview - primal-memory - primitive-containers @@ -3819,8 +3823,10 @@ dont-distribute-packages: - sydtest-amqp - sydtest-autodocodec - sydtest-hedgehog + - sydtest-hedgehog_0_4_0_0 - sydtest-hedis - sydtest-hspec + - sydtest-hspec_0_4_0_0 - sydtest-mongo - sydtest-persistent - sydtest-persistent-postgresql @@ -3927,6 +3933,7 @@ dont-distribute-packages: - tinkoff-invest-sdk - tintin - tinytools + - tinytools-vty - tip-haskell-frontend - tip-lib - titan diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d8ebe5bd9f6b..dcca6089e9c5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17991,6 +17991,7 @@ self: { ]; description = "converting text to properly encoded german umlauts"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "replaceUmlaut"; }) {}; @@ -74465,6 +74466,7 @@ self: { ]; description = "daino is a static site generator (SSG) using shake and pandoc"; license = "GPL"; + hydraPlatforms = lib.platforms.none; mainProgram = "daino"; }) {}; @@ -101127,7 +101129,9 @@ self: { ]; description = "Program to manage the imports of a haskell module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fix-imports"; + broken = true; }) {}; "fix-parser-simple" = callPackage @@ -109357,6 +109361,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "generic-pretty" = callPackage @@ -142129,6 +142135,7 @@ self: { ]; description = "Haskell/Nix development build tools"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; mainProgram = "hix"; }) {}; @@ -232269,6 +232276,7 @@ self: { ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "prettyclass" = callPackage @@ -234781,6 +234789,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; license = "EUPL-1.2"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "prosidy" = callPackage @@ -293452,6 +293462,7 @@ self: { ]; description = "a terminal based unicode diagram editing tool"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "tip-haskell-frontend" = callPackage From ec069270956013e45d4b627391e21c3c81dce4b4 Mon Sep 17 00:00:00 2001 From: maralorn Date: Tue, 11 Apr 2023 12:10:05 +0200 Subject: [PATCH 27/62] haskell-language-server: Enabe builds for ghc 9.6.1 --- pkgs/top-level/release-haskell.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 030739893bb5..893f7134e26a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -497,8 +497,6 @@ let haskell-language-server = lib.subtractLists [ # Support ceased as of 1.9.0.0 compilerNames.ghc884 - # https://github.com/haskell/haskell-language-server/issues/3502 - compilerNames.ghc961 ] released; hoogle = lib.subtractLists [ compilerNames.ghc961 From 84dbda044fb88d8b113a1401f4946bab8ce56900 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Apr 2023 10:26:10 +0000 Subject: [PATCH 28/62] opensmt: 2.4.3 -> 2.5.0 --- pkgs/applications/science/logic/opensmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index ade194cc6cb8..4bc98d5cacdf 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw="; + sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc="; }; nativeBuildInputs = [ cmake bison flex ]; From 5da4f0f877bf4ad89d772435b4eac29c8c475d1a Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Apr 2023 09:41:05 -0600 Subject: [PATCH 29/62] canonicaljson: 1.6.5 -> 2.0.0 Signed-off-by: Sumner Evans --- .../python-modules/canonicaljson/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 0787d4d09718..0dd7a02a4aba 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.5"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs="; + hash = "sha256-4v2u8df63F2ctZvT0NQbBk3dppeAmsQyXc7XIdEvET8="; }; nativeBuildInputs = [ @@ -28,20 +28,10 @@ buildPythonPackage rec { simplejson ]; - passthru.optional-dependencies = { - frozendict = [ - frozendict - ]; - }; - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - "test_frozen_dict" - ]; - pythonImportsCheck = [ "canonicaljson" ]; From 1291a568f27da22c635c6316752bc747c594fe67 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 11 Apr 2023 09:07:31 -0600 Subject: [PATCH 30/62] matrix-synapse: 1.80.0 -> 1.81.0 https://github.com/matrix-org/synapse/releases/tag/v1.81.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0061fa71e6b8..17adab07cf11 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,27 +12,26 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.80.0"; + version = "1.81.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM="; + hash = "sha256-zOpjJSzQNgWQy52GjwR1zy3oaMRTxP92T3hNaYhmcCs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY="; + hash = "sha256-s/zq8VGBdIQu/Q/2gJrLFtZJ+lsTyK+2fr9RYhBTbKA="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml - sed -i 's/^frozendict = ">=1,!=2.1.2,<2.3.5"/frozendict = ">=1,!=2.1.2,<2.3.6"/g' pyproject.toml ''; nativeBuildInputs = [ @@ -52,8 +51,8 @@ buildPythonApplication rec { bleach canonicaljson daemonize - frozendict ijson + immutabledict jinja2 jsonschema lxml From d12701fed117b06d771da92c2efc20a902891f7b Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Tue, 11 Apr 2023 18:56:04 +0200 Subject: [PATCH 31/62] cdecrypt: add darwin to supported platforms --- pkgs/development/tools/cdecrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/cdecrypt/default.nix b/pkgs/development/tools/cdecrypt/default.nix index ef14ac5b4090..bcbe34c886c1 100644 --- a/pkgs/development/tools/cdecrypt/default.nix +++ b/pkgs/development/tools/cdecrypt/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hughobrien ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From a3cb302b8a51ad35bf79ab4086d9e2d73278270d Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Tue, 11 Apr 2023 13:55:29 -0400 Subject: [PATCH 32/62] =?UTF-8?q?refactor:=20don=E2=80=99t=20expose=20sbcl?= =?UTF-8?q?=202.1.9=20to=20all-packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only give access to it when explicitly requested by CLPM. This prevents polluting all-packages namespace with a deprecated package. --- pkgs/development/tools/clpm/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index 06623538a3bc..1a6262913aa4 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -2,14 +2,20 @@ , stdenv , fetchgit , wrapLisp -# Broken on newer versions: -# https://gitlab.common-lisp.net/clpm/clpm/-/issues/51 -# Once that bug is fixed, replace this with regular ‘sbcl’ and remove all -# references to sbcl 2.1.9 from nixpkgs, including from sbcl/2.x.nix. -, _sbcl_2_1_9 , openssl +, sbcl }: +# Broken on newer versions: +# "https://gitlab.common-lisp.net/clpm/clpm/-/issues/51". Once that bug is +# fixed, remove this, and all 2.1.9 references from the SBCL build file. +with rec { + sbcl_2_1_9 = sbcl.override (_: { + version = "2.1.9"; + }); +}; + + stdenv.mkDerivation rec { pname = "clpm"; version = "0.4.1"; @@ -40,7 +46,7 @@ stdenv.mkDerivation rec { # ld to complaing about `impure path used in link`. export HOME=$TMP - ${_sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp + ${sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac986e6b12bd..2fe1c7f6c24a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24570,13 +24570,6 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - # This is a deprecated derivation, marked internal to avoid third party - # packages depending on it. It is used for CLPM only, and will be removed - # soon. - _sbcl_2_1_9 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.9"; }; - faslExt = "fasl"; - }; sbcl_2_2_11 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; }; faslExt = "fasl"; From 58cb284c0e3525f80bee3033703170c49e332fbe Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Apr 2023 22:11:07 +0200 Subject: [PATCH 33/62] nginxStable: 1.22.1 -> 1.24.0 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 904cbe3fadc0..e3fab406c8d5 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.22.1"; - hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE="; + version = "1.24.0"; + hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0="; } From 68c39e6f41a104a38685f90162c02effbccf6510 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Apr 2023 22:12:12 +0200 Subject: [PATCH 34/62] nginxMainline: 1.23.4 -> 1.24.0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5007defeed1e..e43eb0d7b593 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.23.4"; - hash = "sha256-1DMA42uySafm7cYLyhsPw3Kguvzi80bXas+2d6h5D8A="; + version = "1.24.0"; + hash = "sha256-d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0="; } From 5d51efc13985608c48723c2270630b7c852ba1ae Mon Sep 17 00:00:00 2001 From: Daniel K Lyons Date: Tue, 11 Apr 2023 15:05:56 -0600 Subject: [PATCH 35/62] python3Packages.distributed: unmark broken on aarch64 --- pkgs/development/python-modules/distributed/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 17aec987d953..78d6d87832f6 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -65,7 +65,6 @@ buildPythonPackage rec { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; license = licenses.bsd3; - platforms = platforms.x86; # fails on aarch64 maintainers = with maintainers; [ teh costrouc ]; }; } From 5e9077b453730ca5a43bc7df8ad42e3c3a877070 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 12 Apr 2023 01:16:07 +0200 Subject: [PATCH 36/62] haskellPackages.cabal2nix-unstable: 2023-02-27 -> 2023-04-11 --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index ed48a5e1dbc2..08e7dd4bb466 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-02-27"; + version = "unstable-2023-04-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/5e183d1ac819ea1beec3da6229d76d4185b026d0.tar.gz"; - sha256 = "0picq2zzr3hnwzv86p07xymrp84kdb4q5b373a07xgqqqql1wn52"; + url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz"; + sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dcca6089e9c5..c57bae6dc844 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15096,19 +15096,19 @@ self: { }) {}; "NetSNMP" = callPackage - ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: + ({ mkDerivation, base, bytestring, HUnit, net-snmp, process }: mkDerivation { pname = "NetSNMP"; version = "0.3.2.5"; sha256 = "0gslhzalip3q4shhfnp09p0c004z30a1xphw96kbi441ns8s0dp0"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ net_snmp ]; + librarySystemDepends = [ net-snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; description = "Bindings for net-snmp's C API for clients"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {net_snmp = null;}; + }) {inherit (pkgs) net-snmp;}; "Network-NineP" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers From fefba1a6dee2db563de66640f2408cf4a113e81b Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:17:56 +0200 Subject: [PATCH 37/62] mlterm: unbreak darwin --- pkgs/applications/terminal-emulators/mlterm/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index c24830cf2ddb..a96ca5c03de6 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { fcitx5 fcitx5-gtk ibus - ] ++ lib.optionals (stdenv.system != "aarch64-linux") [ - # FIXME Currently broken on aarch64-linux uim ]; @@ -123,6 +121,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; - broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51 }; } From 1c76b01386e78beac26c95106986c164303f6dbc Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:24:16 +0200 Subject: [PATCH 38/62] mlterm: enable libvte on darwin --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index a96ca5c03de6..6045a6da2b28 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { gtk3 harfbuzz fribidi + vte ] ++ lib.optionals (!stdenv.isDarwin) [ # need linker magic, not adapted for Darwin yet openssl libssh2 # Not supported on Darwin - vte m17n_lib fcitx5 From 8655687b5becc369d24f141e657b56cd93badd2c Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:40:07 +0200 Subject: [PATCH 39/62] mlterm: support all platforms This app can run on pretty much anything. Windows, BSDs, Solaris, Android, Haiku; you name it. --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 6045a6da2b28..af2d9d8fd9d7 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -120,6 +120,6 @@ stdenv.mkDerivation rec { homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; }; } From 45393fdf99b2f999720e5d043b77634b2f846871 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 Apr 2023 10:19:29 +0200 Subject: [PATCH 40/62] mlterm: clean up libssh support openssl is not necessary as a direct dep and we no longer need the linker magic. --- .../terminal-emulators/mlterm/default.nix | 19 ++++--------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index af2d9d8fd9d7..c3ee29545535 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -2,7 +2,7 @@ , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding -, openssl, libssh2 #build-in ssh +, libssh2 #build-in ssh , fcitx5, fcitx5-gtk, ibus, uim #IME , wrapGAppsHook #color picker in mlconfig , Cocoa #Darwin @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { harfbuzz fribidi vte - ] ++ lib.optionals (!stdenv.isDarwin) [ - # need linker magic, not adapted for Darwin yet - openssl - libssh2 + libssh2 + ] ++ lib.optionals (!stdenv.isDarwin) [ # Not supported on Darwin m17n_lib @@ -62,15 +60,6 @@ stdenv.mkDerivation rec { --replace "-m 2755 -g utmp" " " \ --replace "-m 4755 -o root" " " ''; - NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft - -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + lib.optionalString (openssl != null) " - -lcrypto - " + lib.optionalString (libssh2 != null) " - -lssh2 - "; configureFlags = [ "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice @@ -87,7 +76,7 @@ stdenv.mkDerivation rec { "--enable-m17nlib" #character encodings ] ++ lib.optionals stdenv.isDarwin [ "--with-gui=quartz" - ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 806f0e9b71c5..d02d74070667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2563,8 +2563,6 @@ with pkgs; microcom = callPackage ../applications/terminal-emulators/microcom { }; mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { - libssh2 = null; - openssl = null; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; }; From f5ee73c1b7615017a6d6033dc898d6b4ed8cfd2a Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 Apr 2023 10:22:23 +0200 Subject: [PATCH 41/62] mlterm: remove vrthra from maintainers --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index c3ee29545535..cc26d4eea295 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "Multi Lingual TERMinal emulator"; homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ramkromberg atemu ]; + maintainers = with maintainers; [ ramkromberg atemu ]; platforms = platforms.all; }; } From 9063e1b268ed88986e3de883ad17aa0a2401d4db Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Wed, 12 Apr 2023 12:06:14 +0200 Subject: [PATCH 42/62] lisp-modules.duckdb: init Add cl-duckdb, the Common Lisp binding to duckdb. This package is not yet included in Quicklisp. Includes the test and benchmark suites and their modest dependencies. Both execute successfully on sbcl/x86_64-linux. --- pkgs/development/lisp-modules/packages.nix | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 2fc10bbc35a6..55cf5c29e22f 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -550,6 +550,35 @@ let ]; }; + duckdb = build-asdf-system { + pname = "duckdb"; + version = "trunk"; + src = pkgs.fetchFromGitHub { + owner = "ak-coram"; + repo = "cl-duckdb"; + rev = "2f0df62f59fbede0addd8d72cf286f4007818a3e"; + hash = "sha256-+jeOuXtCFZwMvF0XvlRaqTNHIAAFKMx6y1pz6u8Wxug="; + }; + systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ]; + lispLibs = with super; [ + bordeaux-threads + cffi-libffi + cl-ascii-table + cl-spark + fiveam + local-time + local-time-duration + periods + trivial-benchmark + serapeum + str + uuid + ]; + nativeLibs = with pkgs; [ + duckdb libffi + ]; + }; + }); in packages From 59c2e8e2b5a1dacbae681435c19b8bdc77403d74 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Wed, 12 Apr 2023 19:58:40 +0900 Subject: [PATCH 43/62] anki: 2.1.60 -> 2.1.61 Rote update --- pkgs/games/anki/Cargo.lock | 33 +++++------- pkgs/games/anki/default.nix | 16 ++---- ...ownload-nodejs-if-NODE_BINARY-is-set.patch | 53 ------------------- ...=> 0001-Skip-formatting-python-code.patch} | 0 ...ing-YARN_BINARY-for-the-build-system.patch | 36 ------------- 5 files changed, 17 insertions(+), 121 deletions(-) delete mode 100644 pkgs/games/anki/patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch rename pkgs/games/anki/patches/{0003-Skip-formatting-python-code.patch => 0001-Skip-formatting-python-code.patch} (100%) delete mode 100644 pkgs/games/anki/patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch diff --git a/pkgs/games/anki/Cargo.lock b/pkgs/games/anki/Cargo.lock index 800fe4af1ddd..4ede682cc1e5 100644 --- a/pkgs/games/anki/Cargo.lock +++ b/pkgs/games/anki/Cargo.lock @@ -2011,7 +2011,9 @@ dependencies = [ "anki", "futures", "itertools", + "lazy_static", "linkcheck", + "regex", "reqwest", "strum", "tokio", @@ -2406,9 +2408,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if", @@ -2438,9 +2440,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", @@ -3167,15 +3169,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.13" @@ -3804,16 +3797,15 @@ checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -4413,12 +4405,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 74baea43729e..e339b8c0fee1 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -22,14 +22,14 @@ let pname = "anki"; - version = "2.1.60"; - rev = "76d8807315fcc2675e7fa44d9ddf3d4608efc487"; + version = "2.1.61"; + rev = "0c1eaf4ce66c1b90867af9a79b95d9e507262cf8"; src = fetchFromGitHub { owner = "ankitects"; repo = "anki"; rev = version; - hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA="; + hash = "sha256-prTGilOw7SfxWevnMsuGq8Zp5uLfVHzTkoAU57NzqHk="; fetchSubmodules = true; }; @@ -86,7 +86,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-bAtmMGWi5ETIidFFnG3jzJg2mSBnH5ONO2/Lr9A3PpQ="; + hash = "sha256-jP0ltYVB52LolGtN/GGjM4I7ira16rRTXfyJlrdjTX4="; }; # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3 @@ -122,13 +122,7 @@ python3.pkgs.buildPythonApplication { patches = [ ./patches/gl-fixup.patch ./patches/no-update-check.patch - # Upstreamed in https://github.com/ankitects/anki/pull/2446 - # We can drop these once we update to an anki version that includes them - # already - ./patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch - ./patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch - # Not upstreamed - ./patches/0003-Skip-formatting-python-code.patch + ./patches/0001-Skip-formatting-python-code.patch ]; inherit cargoDeps; diff --git a/pkgs/games/anki/patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch b/pkgs/games/anki/patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch deleted file mode 100644 index 3232bee6d7e0..000000000000 --- a/pkgs/games/anki/patches/0001-Don-t-download-nodejs-if-NODE_BINARY-is-set.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 53740ca75d167fab5c403a462e21ecd717b1dafa Mon Sep 17 00:00:00 2001 -From: Euan Kemp -Date: Fri, 17 Mar 2023 22:38:04 +0900 -Subject: [PATCH 1/2] Don't download nodejs if NODE_BINARY is set - -Some build environments, such as nixpkgs, restrict network access and -thus would prefer to not download anything at all. Setting PROTOC_BINARY -and friends makes the build system not download stuff, and the same -should be true for nodejs ---- - build/ninja_gen/src/node.rs | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs -index df05e149d..d08c7011e 100644 ---- a/build/ninja_gen/src/node.rs -+++ b/build/ninja_gen/src/node.rs -@@ -105,16 +105,6 @@ pub fn setup_node( - binary_exports: &[&'static str], - mut data_exports: HashMap<&str, Vec>>, - ) -> Result<()> { -- download_and_extract( -- build, -- "node", -- archive, -- hashmap! { -- "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }], -- "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }] -- }, -- )?; -- - let node_binary = match std::env::var("NODE_BINARY") { - Ok(path) => { - assert!( -@@ -124,6 +114,15 @@ pub fn setup_node( - path.into() - } - Err(_) => { -+ download_and_extract( -+ build, -+ "node", -+ archive, -+ hashmap! { -+ "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }], -+ "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }] -+ }, -+ )?; - inputs![":extract:node:bin"] - } - }; --- -2.39.2 - diff --git a/pkgs/games/anki/patches/0003-Skip-formatting-python-code.patch b/pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch similarity index 100% rename from pkgs/games/anki/patches/0003-Skip-formatting-python-code.patch rename to pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch diff --git a/pkgs/games/anki/patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch b/pkgs/games/anki/patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch deleted file mode 100644 index 1dbba76ae081..000000000000 --- a/pkgs/games/anki/patches/0002-Allow-setting-YARN_BINARY-for-the-build-system.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 16af7d4cabcf10797bd110c905a9d7694bde0fb4 Mon Sep 17 00:00:00 2001 -From: Euan Kemp -Date: Fri, 17 Mar 2023 23:07:05 +0900 -Subject: [PATCH 2/2] Allow setting YARN_BINARY for the build system - ---- - build/ninja_gen/src/node.rs | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs -index d08c7011e..c1e2ce1b3 100644 ---- a/build/ninja_gen/src/node.rs -+++ b/build/ninja_gen/src/node.rs -@@ -129,7 +129,18 @@ pub fn setup_node( - let node_binary = build.expand_inputs(node_binary); - build.variable("node_binary", &node_binary[0]); - -- build.add("yarn", YarnSetup {})?; -+ match std::env::var("YARN_BINARY") { -+ Ok(path) => { -+ assert!( -+ Utf8Path::new(&path).is_absolute(), -+ "YARN_BINARY must be absolute" -+ ); -+ build.add_resolved_files_to_group("yarn:bin", &vec![path]); -+ }, -+ Err(_) => { -+ build.add("yarn", YarnSetup {})?; -+ }, -+ }; - - for binary in binary_exports { - data_exports.insert( --- -2.39.2 - From fe22c818c2a062fd96bb7b74cf32b58848d889f6 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 12 Apr 2023 10:48:13 -0400 Subject: [PATCH 44/62] python310Packages.mlflow: unbreak Add and jailbreak missing `pytz` dependency --- pkgs/development/python-modules/mlflow/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1f3c22dc8138..c165f80ac30f 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -24,6 +24,7 @@ , pythonOlder , pythonRelaxDepsHook , pyarrow +, pytz , pyyaml , querystring_parser , requests @@ -52,6 +53,7 @@ buildPythonPackage rec { # but not mlflow has a 'skinny' install option which does not require `shap`. nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ "shap" ]; + pythonRelaxDeps = [ "pytz" ]; propagatedBuildInputs = [ alembic @@ -74,6 +76,7 @@ buildPythonPackage rec { protobuf python-dateutil pyarrow + pytz pyyaml querystring_parser requests From daa658fca955a078125d085631772f9fb879915e Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 29 Mar 2023 23:05:06 +0200 Subject: [PATCH 45/62] plex: 1.31.3.6868-28fc46b27 -> 1.32.0.6918-6f393eda1 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 13ee4fcb37e0..c76d6ef7339c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.31.3.6868-28fc46b27"; + version = "1.32.0.6918-6f393eda1"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0jag3kdxgsqzxgyyhg75g8ig1w2nbh1b9fy45dbj2vdk5gnlwmi0"; + sha256 = "sha256-q8PZkPGSFnEaeudWLFBq3tL+dMe6a8YW+SyM+JwNpgA="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1xfz9rj5aacm240lm6lsmlwj1c8xckmp48s5qmi75nyawb0bisxk"; + sha256 = "sha256-9rGmUk0m7tBLSo5LeQ1fv2rnmK7WQ9AVDUPU0aqXLrM="; }; outputs = [ "out" "basedb" ]; From cbe3dd7394355b3b4351c939be8bd57d33be1d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 12 Apr 2023 19:57:38 +0200 Subject: [PATCH 46/62] healthchecks: 2.6.1 -> 2.8.1 Diff: https://github.com/healthchecks/healthchecks/compare/refs/tags/v2.6.1...v2.8.1 --- pkgs/servers/web-apps/healthchecks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index d8dc1e940b10..4123d8fd40dd 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "2.6.1"; + version = "2.8.1"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-m6QN0FsuNY81iZYAXf7OaPJ6WCJhDSpF52H5k7SqwRY="; + sha256 = "sha256-lJ0AZJpznet2YKPIyMOx5ZdETZB8de5vp7sydfndxZg="; }; propagatedBuildInputs = with py.pkgs; [ From 31d0beef68f0e29e0538674c0e3d97357b4d3e51 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Apr 2023 00:23:15 +0200 Subject: [PATCH 47/62] haskell.packages.ghc94.ormolu: restore 0.5.* for 9.4 compat ormolu 0.6 wants ghc-lib* for GHC 9.6. It is probably possible to upgrade to this version in the 9.4 set in principle, but this seems simpler for now. --- .../configuration-ghc-9.4.x.nix | 2 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 33 +++++++++++++++++++ 3 files changed, 35 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 b094aa941ade..168e8cc9a77e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -207,8 +207,8 @@ in { relative = "cborg"; }) super.cborg; - # https://github.com/tweag/ormolu/issues/941 ormolu = doDistribute self.ormolu_0_5_3_0; + # https://github.com/tweag/ormolu/issues/941 fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 464bbf27c58d..8dde53af696b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,6 +115,7 @@ extra-packages: - optparse-applicative < 0.16 # needed for niv-0.2.19 - ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 + - ormolu == 0.5.* # 2022-04-12: For ghc 9.4 - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c57bae6dc844..3b3d0853f626 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -214761,6 +214761,39 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_5_3_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, Diff, directory, dlist, file-embed + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.5.3.0"; + sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + Diff directory dlist file-embed filepath ghc-lib-parser megaparsec + MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec path path-io QuickCheck temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "ormolu_0_6_0_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, deepseq, Diff, directory, file-embed From 42ace4e82e3b065fbe39740daad40bdcaf85e32d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 12 Apr 2023 15:37:09 -0700 Subject: [PATCH 48/62] =?UTF-8?q?gnomeExtensions.argos:=2020220930=20?= =?UTF-8?q?=E2=86=92=2020230404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/desktops/gnome/extensions/argos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index 96685f779d83..83828b99b16d 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argos-unstable"; - version = "20220930"; + version = "20230404"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "f5f6f5bf6ab33dd2d65a490efe8faac5a0c07dc6"; - hash = "sha256-kI8EpZ68loM5oOS9Dkde+dkldD08mo9VcDqNhecyTOU="; + rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b"; + hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q="; }; installPhase = '' From 2a16cf80e0906b4e8dfb053d28e8ae51675960ab Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 12 Apr 2023 15:45:21 -0700 Subject: [PATCH 49/62] =?UTF-8?q?gnomeExtensions.system-monitor:=202022-04?= =?UTF-8?q?-25=20=E2=86=92=202023-01-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- .../gnome/extensions/system-monitor/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 62d096730377..7295e2e392a4 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2022-04-25"; + version = "unstable-2023-01-21"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "b359d888fd3fcccf1252f5f1dc390299e701493e"; - hash = "sha256-FHErXetGN4n0TbrLQ5cN7V2IgO96ekHxiHLd0diRFAY="; + rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788"; + hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g="; }; nativeBuildInputs = [ @@ -17,14 +17,10 @@ stdenv.mkDerivation rec { ]; patches = [ - # GNOME 43 compatibility + # GNOME 44 compatibility (fetchpatch { - url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/3b3a617f78c5e9bbce0aa2864b3989335edb37b7.patch"; - hash = "sha256-BAD0ExQYmTg6i02Gg7jcF0vf1zp232vXRjGCn+rBYXE="; - }) - (fetchpatch { - url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/0815ed9da5056542730838fbf6c600506cf7a76f.patch"; - hash = "sha256-pavjlPV9BxXoqb0YrlP2bXT7tkNQaBkTy1pMrI9MLnk="; + url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch"; + hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY="; }) (substituteAll { src = ./paths_and_nonexisting_dirs.patch; From 53b37c7e4b15e3d79ed80175131e0a488ccf4f4b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:01:38 +0300 Subject: [PATCH 50/62] python310Packages.pyngrok: 5.2.2 -> 6.0.0 --- pkgs/development/python-modules/pyngrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 4e99c7e62ff8..6022db4d2e84 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "5.2.2"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-MfpuafEUhFNtEegvihCLmsnHYFBu8kKghfPRp3oqlb8="; + hash = "sha256-3YqHlEuOKFcuPRJr+yyBopSFlFdfUjfu/TZRrgtIcVU="; }; propagatedBuildInputs = [ From 7c9778ff076a2f9fe22e018943f228f72a2b0dd4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:56:11 +0300 Subject: [PATCH 51/62] xmp: minor cleanup --- pkgs/applications/audio/xmp/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 14d425f688fb..ae8a27f32488 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -4,13 +4,6 @@ stdenv.mkDerivation rec { pname = "xmp"; version = "4.1.0"; - meta = with lib; { - description = "Extended module player"; - homepage = "https://xmp.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - }; - src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; @@ -20,4 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxmp ] ++ lib.optionals stdenv.isLinux [ alsa-lib ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; + + meta = with lib; { + description = "Extended module player"; + homepage = "https://xmp.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19acd6446c31..5d9ce40d4a64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35069,8 +35069,7 @@ with pkgs; }; xmp = callPackage ../applications/audio/xmp { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - inherit (darwin.apple_sdk.frameworks) CoreAudio; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; }; xnee = callPackage ../tools/X11/xnee { }; From bc42752a6fc0afff45c08da69ee15fb7d9bad421 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 13 Apr 2023 11:24:15 +0300 Subject: [PATCH 52/62] plasma5Packages.kwin: 5.27.4 -> 5.27.4.1 Fixes #225958 --- pkgs/desktops/plasma-5/srcs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 221239f0235d..22cc1b4dcd58 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -204,11 +204,11 @@ }; }; kwin = { - version = "5.27.4"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz"; - sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q"; - name = "kwin-5.27.4.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz"; + sha256 = "1c821szi4vvxc0aw49nb2xbdgnkc1pl5hadpvc9m4l18qly1v7xk"; + name = "kwin-5.27.4.1.tar.xz"; }; }; kwrited = { From 6092709f22a403b4ef5685828b03a1262d43268f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 13 Apr 2023 11:46:59 +0300 Subject: [PATCH 53/62] Revert "Add LTS version of GnuPG and update libgcrypt to latest LTS version" --- pkgs/development/libraries/libgcrypt/1.5.nix | 53 +++++++++ pkgs/development/libraries/libgcrypt/1.8.nix | 75 ------------ ...gr-Only-use-SKS-pool-CA-for-SKS-pool.patch | 34 ++++++ pkgs/tools/security/gnupg/22.nix | 110 ------------------ ...reviously-known-keys-even-without-UI.patch | 107 ----------------- pkgs/tools/security/gnupg/24.nix | 50 ++++---- ...eviously-known-keys-even-without-UI.patch} | 26 ++--- pkgs/top-level/all-packages.nix | 9 +- 8 files changed, 122 insertions(+), 342 deletions(-) create mode 100644 pkgs/development/libraries/libgcrypt/1.5.nix delete mode 100644 pkgs/development/libraries/libgcrypt/1.8.nix create mode 100644 pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch delete mode 100644 pkgs/tools/security/gnupg/22.nix delete mode 100644 pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch rename pkgs/tools/security/gnupg/{22-allow-import-of-previously-known-keys-even-without-UI.patch => allow-import-of-previously-known-keys-even-without-UI.patch} (82%) diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix new file mode 100644 index 000000000000..918ed20efaaf --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchpatch, fetchurl, libgpg-error, enableCapabilities ? false, libcap }: + +assert enableCapabilities -> stdenv.isLinux; + +stdenv.mkDerivation rec { + pname = "libgcrypt"; + version = "1.5.6"; + + src = fetchurl { + url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2"; + sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; + }; + + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "fix-x86_64-apple-darwin.patch"; + sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=71939faa7c54e7b4b28d115e748a85f134876a02"; + }) + ]; + + buildInputs = + [ libgpg-error ] + ++ lib.optional enableCapabilities libcap; + + # Make sure libraries are correct for .pc and .la files + # Also make sure includes are fixed for callers who don't use libgpgcrypt-config + postInstall = '' + sed -i 's,#include ,#include "${libgpg-error.dev}/include/gpg-error.h",g' $out/include/gcrypt.h + '' + lib.optionalString enableCapabilities '' + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la + ''; + + doCheck = true; + + meta = with lib; { + homepage = "https://www.gnu.org/software/libgcrypt/"; + description = "General-pupose cryptographic library"; + license = licenses.lgpl2Plus; + platforms = platforms.all; + knownVulnerabilities = [ + "CVE-2014-3591" + "CVE-2015-0837" + "CVE-2015-7511" + "CVE-2017-0379" + "CVE-2017-7526" + "CVE-2017-9526" + "CVE-2018-0495" + "CVE-2018-6829" + "CVE-2018-12437" + ]; + }; +} diff --git a/pkgs/development/libraries/libgcrypt/1.8.nix b/pkgs/development/libraries/libgcrypt/1.8.nix deleted file mode 100644 index cce79780f1cb..000000000000 --- a/pkgs/development/libraries/libgcrypt/1.8.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libgpg-error -, enableCapabilities ? false, libcap -, buildPackages -# for passthru.tests -, gnupg -, libotr -, rsyslog -}: - -assert enableCapabilities -> stdenv.isLinux; - -stdenv.mkDerivation rec { - pname = "libgcrypt"; - version = "1.8.10"; - - src = fetchurl { - url = "mirror://gnupg/libgcrypt/libgcrypt-${version}.tar.bz2"; - sha256 = "sha256-aJaRVQH5UeI9AtywRTRpwswiqk13oAH/c6JkfC0p590="; - }; - - outputs = [ "out" "dev" "info" ]; - outputBin = "dev"; - - # The CPU Jitter random number generator must not be compiled with - # optimizations and the optimize -O0 pragma only works for gcc. - # The build enables -O2 by default for everything else. - hardeningDisable = lib.optional stdenv.cc.isClang "fortify"; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - buildInputs = [ libgpg-error ] - ++ lib.optional enableCapabilities libcap; - - strictDeps = true; - - configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ] - ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 - - # Necessary to generate correct assembly when compiling for aarch32 on - # aarch64 - configurePlatforms = [ "host" "build" ]; - - postConfigure = '' - sed -i configure \ - -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' - ''; - - # Make sure libraries are correct for .pc and .la files - # Also make sure includes are fixed for callers who don't use libgpgcrypt-config - postFixup = '' - sed -i 's,#include ,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" - '' + lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la - ''; - - doCheck = true; - - passthru.tests = { - inherit gnupg libotr rsyslog; - }; - - meta = with lib; { - homepage = "https://www.gnu.org/software/libgcrypt/"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; - description = "General-purpose cryptographic library"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - knownVulnerabilities = [ - "CVE-2018-12437" # CVE is about LibTomCrypt - ]; - }; -} diff --git a/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch b/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch new file mode 100644 index 000000000000..061fb0e8de9c --- /dev/null +++ b/pkgs/tools/security/gnupg/0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch @@ -0,0 +1,34 @@ +From 1c9cc97e9d47d73763810dcb4a36b6cdf31a2254 Mon Sep 17 00:00:00 2001 +From: Daniel Kahn Gillmor +Date: Sun, 30 Jun 2019 11:54:35 -0400 +Subject: [PATCH] dirmngr: Only use SKS pool CA for SKS pool + +* dirmngr/http.c (http_session_new): when checking whether the +keyserver is the HKPS pool, check specifically against the pool name, +as ./configure might have been used to select a different default +keyserver. It makes no sense to apply Kristian's certificate +authority to anything other than the literal host +hkps.pool.sks-keyservers.net. + +Signed-off-by: Daniel Kahn Gillmor +GnuPG-Bug-Id: 4593 +--- + dirmngr/http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dirmngr/http.c b/dirmngr/http.c +index 384f2569d..8e5d53939 100644 +--- a/dirmngr/http.c ++++ b/dirmngr/http.c +@@ -767,7 +767,7 @@ http_session_new (http_session_t *r_session, + + is_hkps_pool = (intended_hostname + && !ascii_strcasecmp (intended_hostname, +- get_default_keyserver (1))); ++ "hkps.pool.sks-keyservers.net")); + + /* If the user has not specified a CA list, and they are looking + * for the hkps pool from sks-keyservers.net, then default to +-- +2.22.0 + diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix deleted file mode 100644 index de8bb4027b3b..000000000000 --- a/pkgs/tools/security/gnupg/22.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib, stdenv, fetchurl, buildPackages -, pkg-config, texinfo -, gettext, libassuan, libgcrypt, libgpg-error, libiconv, libksba, npth -, adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib -, enableMinimal ? false -, withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry -}: - -with lib; - -let - pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; -in - -assert guiSupport -> enableMinimal == false; - -stdenv.mkDerivation rec { - pname = "gnupg"; - version = "2.2.41"; - - src = fetchurl { - url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-E/MpEAel6FRvy3vAxmEM5EqqmzmVBZ1PgUW6Cf1b4+E="; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkg-config texinfo ]; - buildInputs = [ - gettext libassuan libgcrypt libgpg-error libiconv libksba npth - ] ++ lib.optionals (!enableMinimal) [ - adns bzip2 gnutls libusb1 openldap readline sqlite zlib - ]; - - patches = [ - ./fix-libusb-include-path.patch - ./tests-add-test-cases-for-import-without-uid.patch - ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - ./22-allow-import-of-previously-known-keys-even-without-UI.patch - ]; - - postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 - # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am - sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' - sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; - - configureFlags = [ - "--with-libgpg-error-prefix=${libgpg-error.dev}" - "--with-libgcrypt-prefix=${libgcrypt.dev}" - "--with-libassuan-prefix=${libassuan.dev}" - "--with-ksba-prefix=${libksba.dev}" - "--with-npth-prefix=${npth}" - ] - ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" - ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; - - postInstall = if enableMinimal - then '' - rm -r $out/{libexec,sbin,share} - for f in $(find $out/bin -type f -not -name gpg) - do - rm $f - done - '' else '' - mkdir -p $out/lib/systemd/user - for f in doc/examples/systemd-user/*.{service,socket} ; do - substitute $f $out/lib/systemd/user/$(basename $f) \ - --replace /usr/bin $out/bin - done - - # add gpg2 symlink to make sure git does not break when signing commits - ln -s $out/bin/gpg $out/bin/gpg2 - - # Make libexec tools available in PATH - for f in $out/libexec/; do - if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi - ln -s $f $out/bin/$(basename $f) - done - - ln -s -t $out/bin $out/libexec/* - ''; - - enableParallelBuilding = true; - - passthru.tests.connman = nixosTests.gnupg; - - meta = with lib; { - homepage = "https://gnupg.org"; - description = "LTS release of the GNU Privacy Guard, a GPL OpenPGP implementation"; - license = licenses.gpl3Plus; - longDescription = '' - The GNU Privacy Guard is the GNU project's complete and free - implementation of the OpenPGP standard as defined by RFC4880. GnuPG - "modern" (2.1) is the latest development with a lot of new features. - GnuPG allows to encrypt and sign your data and communication, features a - versatile key management system as well as access modules for all kind of - public key directories. GnuPG, also known as GPG, is a command line tool - with features for easy integration with other applications. A wealth of - frontend applications and libraries are available. Version 2 of GnuPG - also provides support for S/MIME. - ''; - maintainers = with maintainers; [ fpletz vrthra ]; - platforms = platforms.all; - mainProgram = "gpg"; - }; -} diff --git a/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch deleted file mode 100644 index 8d4f703a3dd1..000000000000 --- a/pkgs/tools/security/gnupg/24-allow-import-of-previously-known-keys-even-without-UI.patch +++ /dev/null @@ -1,107 +0,0 @@ -From: Vincent Breitmoser -Date: Thu, 13 Jun 2019 21:27:42 +0200 -Subject: gpg: allow import of previously known keys, even without UIDs - -* g10/import.c (import_one): Accept an incoming OpenPGP certificate that -has no user id, as long as we already have a local variant of the cert -that matches the primary key. - --- - -This fixes two of the three broken tests in import-incomplete.scm. - -GnuPG-Bug-id: 4393 -Signed-off-by: Daniel Kahn Gillmor ---- - g10/import.c | 44 +++++++++++--------------------------------- - 1 file changed, 11 insertions(+), 33 deletions(-) - - -diff --git a/g10/import.c b/g10/import.c -index 9fab46ca6..61896a6bf 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -1954,7 +1954,6 @@ import_one_real (ctrl_t ctrl, - size_t an; - char pkstrbuf[PUBKEY_STRING_SIZE]; - int merge_keys_done = 0; -- int any_filter = 0; - KEYDB_HANDLE hd = NULL; - - if (r_valid) -@@ -1992,13 +1991,6 @@ import_one_real (ctrl_t ctrl, - } - - -- if (!uidnode) -- { -- if (!silent) -- log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); -- return 0; -- } -- - if (screener && screener (keyblock, screener_arg)) - { - log_error (_("key %s: %s\n"), keystr_from_pk (pk), -@@ -2078,18 +2070,10 @@ import_one_real (ctrl_t ctrl, - } - } - -- /* Delete invalid parts and bail out if there are no user ids left. */ -- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs)) -- { -- if (!silent) -- { -- log_error ( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); -- if (!opt.quiet) -- log_info(_("this may be caused by a missing self-signature\n")); -- } -- stats->no_user_id++; -- return 0; -- } -+ /* Delete invalid parts, and note if we have any valid ones left. -+ * We will later abort import if this key is new but contains -+ * no valid uids. */ -+ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs); - - /* Get rid of deleted nodes. */ - commit_kbnode (&keyblock); -@@ -2099,24 +2083,11 @@ import_one_real (ctrl_t ctrl, - { - apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); - commit_kbnode (&keyblock); -- any_filter = 1; - } - if (import_filter.drop_sig) - { - apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig); - commit_kbnode (&keyblock); -- any_filter = 1; -- } -- -- /* If we ran any filter we need to check that at least one user id -- * is left in the keyring. Note that we do not use log_error in -- * this case. */ -- if (any_filter && !any_uid_left (keyblock)) -- { -- if (!opt.quiet ) -- log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk)); -- stats->no_user_id++; -- return 0; - } - - /* The keyblock is valid and ready for real import. */ -@@ -2174,6 +2145,13 @@ import_one_real (ctrl_t ctrl, - err = 0; - stats->skipped_new_keys++; - } -+ else if (err && !any_uid_left (keyblock)) -+ { -+ if (!silent) -+ log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid)); -+ err = 0; -+ stats->no_user_id++; -+ } - else if (err) /* Insert this key. */ - { - /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY. */ diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index a8083215d17b..c1f2825e8e93 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -1,19 +1,13 @@ -{ lib, stdenv, fetchurl, buildPackages -, pkg-config, texinfo -, gettext, libassuan, libgcrypt, libgpg-error, libiconv, libksba, npth -, adns, bzip2, gnutls, libusb1, openldap, readline, sqlite, zlib -, enableMinimal ? false +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba +, libgpg-error, libiconv, npth, gettext, texinfo, buildPackages +, nixosTests +, guiSupport ? stdenv.isDarwin, enableMinimal ? false +, adns, bzip2, gnutls, libusb1, openldap +, pinentry, readline, sqlite, zlib , withPcsc ? !enableMinimal, pcsclite -, guiSupport ? stdenv.isDarwin, pinentry , withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss }: -with lib; - -let - pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; -in - assert guiSupport -> enableMinimal == false; stdenv.mkDerivation rec { @@ -22,43 +16,44 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; + sha256 = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ - gettext libassuan libgcrypt libgpg-error libiconv libksba npth - ] ++ lib.optionals (!enableMinimal) [ - adns bzip2 gnutls libusb1 openldap readline sqlite zlib - ] ++ lib.optionals withTpm2Tss [ tpm2-tss ]; + libgcrypt libassuan libksba libiconv npth gettext + ] ++ lib.optionals (!enableMinimal) ([ + readline libusb1 gnutls adns openldap zlib bzip2 sqlite + ] ++ lib.optional withTpm2Tss tpm2-tss); patches = [ ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch + # TODO: Refresh patch? Doesn't apply on 2.4.0 + #./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch - ./24-allow-import-of-previously-known-keys-even-without-UI.patch + # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch - ]; + ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && withPcsc) '' - sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + '' + lib.optionalString (stdenv.isLinux && withPcsc) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; + pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-libassuan-prefix=${libassuan.dev}" "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" - ] - ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" + ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" ++ lib.optional withTpm2Tss "--with-tss=intel" ++ lib.optional stdenv.isDarwin "--disable-ccid-driver"; - postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share} @@ -81,11 +76,6 @@ stdenv.mkDerivation rec { if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi ln -s $f $out/bin/$(basename $f) done - - for f in $out/libexec/; do - if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi - ln -s $f $out/bin/$(basename $f) - done ''; enableParallelBuilding = true; diff --git a/pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch similarity index 82% rename from pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch rename to pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch index e8fbe1688402..98dda54fc7fa 100644 --- a/pkgs/tools/security/gnupg/22-allow-import-of-previously-known-keys-even-without-UI.patch +++ b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch @@ -16,12 +16,11 @@ Signed-off-by: Daniel Kahn Gillmor g10/import.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) - diff --git a/g10/import.c b/g10/import.c -index cd3363fc7..8f10771db 100644 +index 5d3162c..f9acf95 100644 --- a/g10/import.c +++ b/g10/import.c -@@ -1858,7 +1858,6 @@ import_one_real (ctrl_t ctrl, +@@ -1788,7 +1788,6 @@ import_one_real (ctrl_t ctrl, size_t an; char pkstrbuf[PUBKEY_STRING_SIZE]; int merge_keys_done = 0; @@ -29,11 +28,12 @@ index cd3363fc7..8f10771db 100644 KEYDB_HANDLE hd = NULL; if (r_valid) -@@ -1896,13 +1895,6 @@ import_one_real (ctrl_t ctrl, +@@ -1825,14 +1824,6 @@ import_one_real (ctrl_t ctrl, + log_printf ("\n"); } - -- if (!uidnode ) +- +- if (!uidnode) - { - if (!silent) - log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); @@ -43,17 +43,17 @@ index cd3363fc7..8f10771db 100644 if (screener && screener (keyblock, screener_arg)) { log_error (_("key %s: %s\n"), keystr_from_pk (pk), -@@ -1977,18 +1969,10 @@ import_one_real (ctrl_t ctrl, +@@ -1907,18 +1898,10 @@ import_one_real (ctrl_t ctrl, } } - /* Delete invalid parts and bail out if there are no user ids left. */ -- if (!delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs)) +- if (!delete_inv_parts (ctrl, keyblock, keyid, options)) - { - if (!silent) - { -- log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); -- if (!opt.quiet ) +- log_error ( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); +- if (!opt.quiet) - log_info(_("this may be caused by a missing self-signature\n")); - } - stats->no_user_id++; @@ -62,11 +62,11 @@ index cd3363fc7..8f10771db 100644 + /* Delete invalid parts, and note if we have any valid ones left. + * We will later abort import if this key is new but contains + * no valid uids. */ -+ delete_inv_parts (ctrl, keyblock, keyid, options, otherrevsigs); ++ delete_inv_parts (ctrl, keyblock, keyid, options); /* Get rid of deleted nodes. */ commit_kbnode (&keyblock); -@@ -1998,24 +1982,11 @@ import_one_real (ctrl_t ctrl, +@@ -1927,24 +1911,11 @@ import_one_real (ctrl_t ctrl, { apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); commit_kbnode (&keyblock); @@ -91,7 +91,7 @@ index cd3363fc7..8f10771db 100644 } /* The keyblock is valid and ready for real import. */ -@@ -2073,6 +2044,13 @@ import_one_real (ctrl_t ctrl, +@@ -2002,6 +1973,13 @@ import_one_real (ctrl_t ctrl, err = 0; stats->skipped_new_keys++; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e648b27a05c..a6e1542ed3e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,13 +7887,8 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - - gnupg22 = callPackage ../tools/security/gnupg/22.nix { - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; - libgcrypt = libgcrypt_1_8; - }; - gnupg24 = callPackage ../tools/security/gnupg/24.nix { + guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; @@ -21535,7 +21530,7 @@ with pkgs; libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { }; + libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; From 451e9399e39cad7a137bf0cb19c75da5bc3a70f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Apr 2023 10:49:17 +0200 Subject: [PATCH 54/62] gitea: 1.19.0 -> 1.19.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index b7dd682e24a4..6f38b2f7c63d 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -19,12 +19,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.19.0"; + version = "1.19.1"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ="; + hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk="; }; vendorHash = null; From 51fafd0b425ae20ff61ddbe655c93095e90bc834 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Apr 2023 11:32:07 +0200 Subject: [PATCH 55/62] python310Packages.zigpy: 0.54.0 -> 0.54.1 Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.54.0...0.54.1 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.54.1 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 343afffe4f07..6d323ecdb952 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.54.0"; + version = "0.54.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-5R08fols3LkZknddqProM7ekte9Z4wSh6ao7a99wbIg="; + hash = "sha256-CFrqDKLklvbPBWAA0S6APGBYEXdmHYRzvbTzSfJ451w="; }; propagatedBuildInputs = [ From 8dfdb13f654e7d6423cf64c7d795d254d8875062 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 07:43:42 +0200 Subject: [PATCH 56/62] python310Packages.zha-quirks: 0.0.96 -> 0.0.97 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.96...0.0.97 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.97 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b6fef9fc8e0e..78a589674676 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.96"; + version = "0.0.97"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-GqKQPOP3cJe4UyE5OsLCjNVPT8YKsJ0q8ApsJsAk4uw="; + hash = "sha256-A96Q+BoHKc9Q2XY70gAZYg1f1l8hts9P0kiBQwDMN+s="; }; propagatedBuildInputs = [ From ebd2084328b1f314ca9d0d4f07ad2ea11f8d8c50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Apr 2023 11:33:32 +0200 Subject: [PATCH 57/62] python310Packages.bellows: 0.35.0 -> 0.35.1 Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.35.0...0.35.1 Changelog: https://github.com/zigpy/bellows/releases/tag/0.35.1 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index a39cce656a21..dd7a274735f4 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.0"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-LxIIaxrDWRdYV3K2Geuz0gdDEzqMzYN1tXvjIkQxQoA="; + hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY="; }; propagatedBuildInputs = [ From 9b432dd5647f474196353110baf7c52cdbfb6c01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Apr 2023 11:34:16 +0200 Subject: [PATCH 58/62] python310Packages.env-canada: 0.5.31 -> 0.5.32 Diff: https://github.com/michaeldavie/env_canada/compare/refs/tags/v0.5.31...v0.5.32 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.5.32/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index c32c81555d78..a01b7cbc8a6b 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.31"; + version = "0.5.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-68pHCsY2smaS1nO+fWN1tXy7VyhXcbYzoGmA1cAN5h4="; + hash = "sha256-YX0v1i8PuVDq1+LPxV2Fs76N4PLxAQrKCAIeabmzNwc="; }; propagatedBuildInputs = [ From 2d5441995320c3663f682200462d2d3605100854 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Apr 2023 11:34:31 +0200 Subject: [PATCH 59/62] home-assistant: 2023.4.2 -> 2023.4.3 https://github.com/home-assistant/core/releases/tag/2023.4.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 43fa7e47d23d..3c37cf8fc834 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.4.2"; + version = "2023.4.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 568c029543bb..5bfba55fc56f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -310,7 +310,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.2"; + hassVersion = "2023.4.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-Fl8CxHK8Gg4wf+kyptyiLZx8MG/eI5kTr+pSLEl729I="; + hash = "sha256-L99fwGHjSHaE4ba9zA5wL0Zd7kTZsZLefjLMrvOgymw="; }; # Secondary source is git for tests @@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-XCxFi7ts4KQdKl68YP4Ps60SWW22NoNuoGFo50xbl8s="; + hash = "sha256-X7qZfehUSOOlW5d6pZDLnx7Qs+U+kw/6Cs6oiJle5qY="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5c5eb3e8268b..c69997f97dbe 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230406.1"; + version = "20230411.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-hMHSkkSeIY+KH4jHOrbL9Oxo0qnm0lRggDy+CQ71a+U="; + hash = "sha256-OCNOIFB4BmpEviOiXz39wE8cJ/gcVOOCYF5r8ZiG6o0="; }; # there is nothing to strip in this package From 1aba349b349afe53ddb3d190cfe2a1e6f508c670 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Apr 2023 17:10:42 +0200 Subject: [PATCH 60/62] python310Packages.ulid-transform: 0.6.0 -> 0.6.3 Diff: https://github.com/bdraco/ulid-transform/compare/refs/tags/v0.6.0...v0.6.3 Changelog: https://github.com/bdraco/ulid-transform/releases/tag/v0.6.3 --- pkgs/development/python-modules/ulid-transform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 3025407e5a8a..15e64927f0e2 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.6.0"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sdzgM+w0z8kxzoSzR5BD0cOpry4ijTXpKnPvw916tCs="; + hash = "sha256-hnEzWm5DWSGq5R2KpVHo5L5XYu6Hv3ZWQ4UdGC73By0="; }; nativeBuildInputs = [ From 0944487ccf770cb6bcf6a0f7e5130e5ead72e3f3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Apr 2023 19:40:37 +0000 Subject: [PATCH 61/62] clippy: use the right rustc when cross compiling When cross compiling, buildPackages.cargo uses a rustc that can build for both the build and host platforms. This was not true of buildPackages.clippy, so it was not possible to use clippy for a cross target. Now it is. I've modified clippy.nix to use rustc from rustPlatform, so we only have to add a single override in default.nix. --- pkgs/development/compilers/rust/clippy.nix | 12 +++++++----- pkgs/development/compilers/rust/default.nix | 8 +++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 499db45021ea..26c73dba33d6 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,7 +1,8 @@ -{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +{ stdenv, lib, rustPlatform, Security, patchelf }: + rustPlatform.buildRustPackage { pname = "clippy"; - inherit (rustc) version src; + inherit (rustPlatform.rust.rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; @@ -10,7 +11,8 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ rustPlatform.rust.rustc.llvm ] + ++ lib.optionals stdenv.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -27,8 +29,8 @@ rustPlatform.buildRustPackage { # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver" - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy" + install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/clippy-driver" + install_name_tool -add_rpath "${rustPlatform.rust.rustc}/lib" "$out/bin/cargo-clippy" ''; meta = with lib; { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 42ca74c7164d..1ef03420ced9 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -83,7 +83,13 @@ in }; cargo-auditable = self.callPackage ./cargo-auditable.nix { }; cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; - clippy = self.callPackage ./clippy.nix { inherit Security; }; + clippy = callPackage ./clippy.nix { + # We want to use self, not buildRustPackages, so that + # buildPackages.clippy uses the cross compiler and supports + # linting for the target platform. + rustPlatform = makeRustPlatform self; + inherit Security; + }; }); }; } From a5e267a760a1ac805f0ec89c22e575276e84fd33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Apr 2023 12:20:17 +0200 Subject: [PATCH 62/62] python310Packages.zigpy-znp: Disable failing test --- pkgs/development/python-modules/zigpy-znp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 63298091f7d1..ddcf541fd63e 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { # https://github.com/zigpy/zigpy-znp/issues/209 "--deselect=tests/application/test_joining.py::test_join_device" "--deselect=tests/application/test_joining.py::test_permit_join" + "--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_af" "--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_zdo" "--deselect=tests/application/test_requests.py::test_zigpy_request" "--deselect=tests/application/test_requests.py::test_zigpy_request_failure"