From 61585d1cd7f699dd9187ade7c0b21735c96b53ee Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 22 Feb 2022 14:08:43 -0800 Subject: [PATCH 01/62] nixos/tests/stunnel: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/stunnel.nix | 126 ++++++++++++++++++++++ pkgs/tools/networking/stunnel/default.nix | 6 +- 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/stunnel.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3fd4945ed352..06ebf53dd80b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -483,6 +483,7 @@ in starship = handleTest ./starship.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; + stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; diff --git a/nixos/tests/stunnel.nix b/nixos/tests/stunnel.nix new file mode 100644 index 000000000000..e5e2b85ccbe2 --- /dev/null +++ b/nixos/tests/stunnel.nix @@ -0,0 +1,126 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + stunnelCommon = { + services.stunnel = { + enable = true; + user = "stunnel"; + }; + users.groups.stunnel = { }; + users.users.stunnel = { + isSystemUser = true; + group = "stunnel"; + }; + }; + makeCert = { config, pkgs, ... }: { + system.activationScripts.create-test-cert = stringAfter [ "users" ] '' + ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} + ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) + chown stunnel /test-key.pem /test-key-and-cert.pem + ''; + }; + serverCommon = { pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 443 ]; + services.stunnel.servers.https = { + accept = "443"; + connect = 80; + cert = "/test-key-and-cert.pem"; + }; + systemd.services.simple-webserver = { + wantedBy = [ "multi-user.target" ]; + script = '' + cd /etc/webroot + ${pkgs.python3}/bin/python -m http.server 80 + ''; + }; + }; + copyCert = src: dest: filename: '' + from shlex import quote + ${src}.wait_for_file("/test-key-and-cert.pem") + server_cert = ${src}.succeed("cat /test-cert.pem") + ${dest}.succeed("echo %s > ${filename}" % quote(server_cert)) + ''; + +in { + basicServer = makeTest { + name = "basicServer"; + + nodes = { + client = { }; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + environment.etc."webroot/index.html".text = "well met"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + + server.wait_for_unit("simple-webserver") + server.wait_for_unit("stunnel") + + client.succeed("curl --fail --cacert /authorized-server-cert.crt https://server/ > out") + client.succeed('[[ "$(< out)" == "well met" ]]') + ''; + }; + + serverAndClient = makeTest { + name = "serverAndClient"; + + nodes = { + client = { + imports = [ stunnelCommon ]; + services.stunnel.clients = { + httpsClient = { + accept = "80"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + }; + httpsClientWithHostVerify = { + accept = "81"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + verifyHostname = "server"; + }; + httpsClientWithHostVerifyFail = { + accept = "82"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + verifyHostname = "wronghostname"; + }; + }; + }; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + environment.etc."webroot/index.html".text = "hello there"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + + server.wait_for_unit("simple-webserver") + server.wait_for_unit("stunnel") + + # In case stunnel came up before we got the server's cert copied over + client.succeed("systemctl reload-or-restart stunnel") + + client.succeed("curl --fail http://localhost/ > out") + client.succeed('[[ "$(< out)" == "hello there" ]]') + + client.succeed("curl --fail http://localhost:81/ > out") + client.succeed('[[ "$(< out)" == "hello there" ]]') + + client.fail("curl --fail http://localhost:82/ > out") + client.succeed('[[ "$(< out)" == "" ]]') + ''; + }; +} diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index c42e78c933d9..b3ebacb27274 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "stunnel"; @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + passthru.tests = { + stunnel = nixosTests.stunnel; + }; + meta = { description = "Universal tls/ssl wrapper"; homepage = "https://www.stunnel.org/"; From 131399effb405114449d7777da650d0977931178 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 22 Feb 2022 16:42:29 -0800 Subject: [PATCH 02/62] nixos/stunnel: Make free-form This unlocks stunnel's other ~100 configuration directives, allowing full stunnel use in NixOS. --- nixos/modules/services/networking/stunnel.nix | 158 +++++++----------- 1 file changed, 57 insertions(+), 101 deletions(-) diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index df4908a0fff9..55fac27f92ce 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -7,80 +7,27 @@ let cfg = config.services.stunnel; yesNo = val: if val then "yes" else "no"; + verifyRequiredField = type: field: n: c: { + assertion = hasAttr field c; + message = "stunnel: \"${n}\" ${type} configuration - Field ${field} is required."; + }; + verifyChainPathAssert = n: c: { - assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer); + assertion = (c.verifyHostname or null) == null || (c.verifyChain || c.verifyPeer); message = "stunnel: \"${n}\" client configuration - hostname verification " + "is not possible without either verifyChain or verifyPeer enabled"; }; - serverConfig = { - options = { - accept = mkOption { - type = types.either types.str types.int; - description = '' - On which [host:]port stunnel should listen for incoming TLS connections. - Note that unlike other softwares stunnel ipv6 address need no brackets, - so to listen on all IPv6 addresses on port 1234 one would use ':::1234'. - ''; - }; - - connect = mkOption { - type = types.either types.str types.int; - description = "Port or IP:Port to which the decrypted connection should be forwarded."; - }; - - cert = mkOption { - type = types.path; - description = "File containing both the private and public keys."; - }; - }; - }; - - clientConfig = { - options = { - accept = mkOption { - type = types.str; - description = "IP:Port on which connections should be accepted."; - }; - - connect = mkOption { - type = types.str; - description = "IP:Port destination to connect to."; - }; - - verifyChain = mkOption { - type = types.bool; - default = true; - description = "Check if the provided certificate has a valid certificate chain (against CAPath)."; - }; - - verifyPeer = mkOption { - type = types.bool; - default = false; - description = "Check if the provided certificate is contained in CAPath."; - }; - - CAPath = mkOption { - type = types.nullOr types.path; - default = null; - description = "Path to a directory containing certificates to validate against."; - }; - - CAFile = mkOption { - type = types.nullOr types.path; - default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - defaultText = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; - description = "Path to a file containing certificates to validate against."; - }; - - verifyHostname = mkOption { - type = with types; nullOr str; - default = null; - description = "If set, stunnel checks if the provided certificate is valid for the given hostname."; - }; - }; - }; - + removeNulls = mapAttrs (_: filterAttrs (_: v: v != null)); + mkValueString = v: + if v == true then "yes" + else if v == false then "no" + else generators.mkValueStringDefault {} v; + generateConfig = c: + generators.toINI { + mkSectionName = id; + mkKeyValue = k: v: "${k} = ${mkValueString v}"; + } (removeNulls c); in @@ -130,8 +77,13 @@ in servers = mkOption { - description = "Define the server configuations."; - type = with types; attrsOf (submodule serverConfig); + description = '' + Define the server configuations. + + See "SERVICE-LEVEL OPTIONS" in stunnel + 8. + ''; + type = with types; attrsOf (attrsOf (nullOr (oneOf [bool int str]))); example = { fancyWebserver = { accept = 443; @@ -143,8 +95,33 @@ in }; clients = mkOption { - description = "Define the client configurations."; - type = with types; attrsOf (submodule clientConfig); + description = '' + Define the client configurations. + + By default, verifyChain and OCSPaia are enabled and a CAFile is provided from pkgs.cacert. + + See "SERVICE-LEVEL OPTIONS" in stunnel + 8. + ''; + type = with types; attrsOf (attrsOf (nullOr (oneOf [bool int str]))); + + apply = let + applyDefaults = c: + { + CAFile = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + OCSPaia = true; + verifyChain = true; + } // c; + setCheckHostFromVerifyHostname = c: + # To preserve backward-compatibility with the old NixOS stunnel module + # definition, allow "verifyHostname" as an alias for "checkHost". + c // { + checkHost = c.checkHost or c.verifyHostname or null; + verifyHostname = null; # Not a real stunnel configuration setting + }; + forceClient = c: c // { client = true; }; + in mapAttrs (_: c: forceClient (setCheckHostFromVerifyHostname (applyDefaults c))); + example = { foobar = { accept = "0.0.0.0:8080"; @@ -169,6 +146,11 @@ in }) (mapAttrsToList verifyChainPathAssert cfg.clients) + (mapAttrsToList (verifyRequiredField "client" "accept") cfg.clients) + (mapAttrsToList (verifyRequiredField "client" "connect") cfg.clients) + (mapAttrsToList (verifyRequiredField "server" "accept") cfg.servers) + (mapAttrsToList (verifyRequiredField "server" "cert") cfg.servers) + (mapAttrsToList (verifyRequiredField "server" "connect") cfg.servers) ]; environment.systemPackages = [ pkgs.stunnel ]; @@ -183,36 +165,10 @@ in ${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" } ; ----- SERVER CONFIGURATIONS ----- - ${ lib.concatStringsSep "\n" - (lib.mapAttrsToList - (n: v: '' - [${n}] - accept = ${toString v.accept} - connect = ${toString v.connect} - cert = ${v.cert} - - '') - cfg.servers) - } + ${ generateConfig cfg.servers } ; ----- CLIENT CONFIGURATIONS ----- - ${ lib.concatStringsSep "\n" - (lib.mapAttrsToList - (n: v: '' - [${n}] - client = yes - accept = ${v.accept} - connect = ${v.connect} - verifyChain = ${yesNo v.verifyChain} - verifyPeer = ${yesNo v.verifyPeer} - ${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"} - ${optionalString (v.CAFile != null) "CAFile = ${v.CAFile}"} - ${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"} - OCSPaia = yes - - '') - cfg.clients) - } + ${ generateConfig cfg.clients } ''; systemd.services.stunnel = { From 0e857fc1d92ab5ce0c8b53e2a1df558892c3b2ff Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 22 Feb 2022 16:54:15 -0800 Subject: [PATCH 03/62] nixos/tests/stunnel: Add mutual authentication test --- nixos/tests/stunnel.nix | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/nixos/tests/stunnel.nix b/nixos/tests/stunnel.nix index e5e2b85ccbe2..22c087290fc7 100644 --- a/nixos/tests/stunnel.nix +++ b/nixos/tests/stunnel.nix @@ -123,4 +123,52 @@ in { client.succeed('[[ "$(< out)" == "" ]]') ''; }; + + mutualAuth = makeTest { + name = "mutualAuth"; + + nodes = rec { + client = { + imports = [ makeCert stunnelCommon ]; + services.stunnel.clients.authenticated-https = { + accept = "80"; + connect = "server:443"; + verifyPeer = true; + CAFile = "/authorized-server-cert.crt"; + cert = "/test-cert.pem"; + key = "/test-key.pem"; + }; + }; + wrongclient = client; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + services.stunnel.servers.https = { + CAFile = "/authorized-client-certs.crt"; + verifyPeer = true; + }; + environment.etc."webroot/index.html".text = "secret handshake"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + ${copyCert "client" "server" "/authorized-client-certs.crt"} + ${copyCert "server" "wrongclient" "/authorized-server-cert.crt"} + + # In case stunnel came up before we got the cross-certs in place + client.succeed("systemctl reload-or-restart stunnel") + server.succeed("systemctl reload-or-restart stunnel") + wrongclient.succeed("systemctl reload-or-restart stunnel") + + server.wait_for_unit("simple-webserver") + client.fail("curl --fail --insecure https://server/ > out") + client.succeed('[[ "$(< out)" == "" ]]') + client.succeed("curl --fail http://localhost/ > out") + client.succeed('[[ "$(< out)" == "secret handshake" ]]') + wrongclient.fail("curl --fail http://localhost/ > out") + wrongclient.succeed('[[ "$(< out)" == "" ]]') + ''; + }; } From 251b2195f0e407042146f5100792a7524cbe653e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Apr 2022 05:06:08 +0000 Subject: [PATCH 04/62] jackett: 0.20.709 -> 0.20.915 --- pkgs/servers/jackett/default.nix | 4 ++-- pkgs/servers/jackett/deps.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 69e891fe595e..46f956fd4134 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.709"; + version = "0.20.915"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "Gx1VHjs37XBcvw20pQNrA/meLuVmogdGIzroRXvTv5Q="; + sha256 = "aKl0PTzmaBPhVihWDP2WMlt3aA9D53w/o/wOFQo7ArA="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 022c604d0a91..1652efc78979 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.0"; sha256 = "1rx5x2zks2aryy6mbly86a83gxzm0y7bbx9834b3224673rs7ra0"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.0"; sha256 = "07jsyhlrg0jb1cjn1p20wp2c9rsjqxv7kh6vvd0xv0mjd88idchr"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.4"; sha256 = "17q1nwvlwzg8qhrzdwliwijz9sd68jrwwf2alh8kc0sxx3zaj4l5"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.2.0"; sha256 = "10zhr7hgzm9w0gfg0sa0h2qdlna0w7n2jl72s4j7hi6mf68px2xm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) @@ -168,7 +168,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MimeMapping"; version = "1.0.1.37"; sha256 = "19kkfjrvx9akm4l8z1dddkv7mfx4k2dkn5b69690z93mjpsa0l2g"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "Mono.Posix"; version = "7.1.0-final.1.21458.1"; sha256 = "0gn70m4ajkyyv5jvcx09935anj7i2565yj0g8sgzaacnxjp5pfli"; }) + (fetchNuGet { pname = "Mono.Unix"; version = "7.1.0-final.1.21458.1"; sha256 = "0yv065hyikg2n3m61dlg8qf1z609y2f37ya2zsg50f5qx64ffvdn"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.7"; sha256 = "0285pdxhndcn77pqjg5zhv381yrv8dq2z6j05gf4j2yc8zkz2kmb"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.7"; sha256 = "1dmdb3g07wkciccv69nfrvqnda400qlh0kkgy28l8s00iil31dmr"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) From 2abf031a476eb38678688a9133a68fcca36a363a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 5 Jul 2022 02:07:11 +0000 Subject: [PATCH 05/62] txtpbfmt: init at unstable-2022-06-08 --- pkgs/development/tools/txtpbfmt/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/txtpbfmt/default.nix diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix new file mode 100644 index 000000000000..3f1c9eab0475 --- /dev/null +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "txtpbfmt"; + version = "unstable-2022-06-08"; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "txtpbfmt"; + rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; + sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + }; + + vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Formatter for text proto files"; + homepage = "https://github.com/protocolbuffers/txtpbfmt"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 432f56dd83c8..1d2a8c476f6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11318,6 +11318,10 @@ with pkgs; ttylog = callPackage ../tools/misc/ttylog { }; + txtpbfmt = callPackage ../development/tools/txtpbfmt { + buildGoModule = buildGo118Module; + }; + ipbt = callPackage ../tools/misc/ipbt { }; tuhi = callPackage ../applications/misc/tuhi { }; From 1c44717f11ce05c1a41efcab161fc526d41b4cf9 Mon Sep 17 00:00:00 2001 From: wyndon Date: Mon, 4 Jul 2022 20:01:51 +0200 Subject: [PATCH 06/62] httm: 0.12.2 -> 0.13.4 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 51f0e039df79..44200e71de16 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.12.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "gly3P4b6MlhJA/Qre6S0iFGBaY0Hi/u4hzlirdTdZoc="; + sha256 = "SNO5YNBx6zyI99n0+ZujJb6AgrJknEEvYWJIh67VUSc="; }; - cargoSha256 = "fq4RVJT6u2ST4Nu9zAnfcXZQqWe8gdC4cFwrJzFums4="; + cargoSha256 = "+yaWdP8mIlOMzx9Fl4i22DMDpo6zigs2ijrR8pFhk6U="; nativeBuildInputs = [ installShellFiles ]; From 642279ab6fa65cd8207699a5eb7da5a0e0d0a19a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:00:22 +0200 Subject: [PATCH 07/62] haskellPackages: stackage LTS 19.15 -> LTS 19.16 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 99112fb4a2f9..e0e05f00797d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.15 +# Stackage LTS 19.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -16,8 +16,8 @@ default-package-overrides: - adjunctions ==4.4.1 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.1 - - aern2-mp ==0.2.8.0 - - aern2-real ==0.2.8.0 + - aern2-mp ==0.2.9.1 + - aern2-real ==0.2.9.1 - aeson ==2.0.3.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.1 @@ -293,7 +293,7 @@ default-package-overrides: - case-insensitive ==1.2.1.0 - cases ==0.1.4.1 - casing ==0.1.4.1 - - cassava ==0.5.2.0 + - cassava ==0.5.3.0 - cassava-conduit ==0.6.0 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 @@ -333,7 +333,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - circular ==0.4.0.2 + - circular ==0.4.0.3 - citeproc ==0.6.0.1 - clash-ghc ==1.6.3 - clash-lib ==1.6.3 @@ -581,7 +581,7 @@ default-package-overrides: - di-monad ==1.3.1 - directory-tree ==0.12.1 - direct-sqlite ==2.3.27 - - dirichlet ==0.1.0.6 + - dirichlet ==0.1.0.7 - discount ==0.1.1 - discover-instances ==0.1.0.0 - discrimination ==0.4.1 @@ -813,7 +813,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.0 - - fused-effects ==1.1.1.3 + - fused-effects ==1.1.2.0 - fusion-plugin ==0.2.4 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -898,6 +898,7 @@ default-package-overrides: - gi-cairo-render ==0.1.1 - gi-dbusmenu ==0.4.10 - gi-dbusmenugtk3 ==0.4.11 + - gi-freetype2 ==2.0.1 - gi-gdk ==3.0.25 - gi-gdkpixbuf ==2.0.28 - gi-gdkx11 ==3.0.12 @@ -909,7 +910,7 @@ default-package-overrides: - gi-gtk ==3.0.38 - gi-gtk-hs ==0.3.12 - gi-gtksource ==3.0.25 - - gi-harfbuzz ==0.0.5 + - gi-harfbuzz ==0.0.6 - gi-javascriptcore ==4.0.24 - ginger ==0.10.4.0 - gi-pango ==1.0.26 @@ -1036,7 +1037,7 @@ default-package-overrides: - hedn ==0.3.0.4 - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.6 + - heterocephalus ==1.0.5.7 - hex ==0.2.0 - hexml ==0.3.4 - hexpat ==0.20.13 @@ -1392,8 +1393,8 @@ default-package-overrides: - lens-action ==0.2.6 - lens-aeson ==1.1.3 - lens-csv ==0.1.1.0 - - lens-family ==2.1.1 - - lens-family-core ==2.1.0 + - lens-family ==2.1.2 + - lens-family-core ==2.1.2 - lens-family-th ==0.5.2.1 - lens-misc ==0.0.2.0 - lens-process ==0.4.0.0 @@ -1422,7 +1423,7 @@ default-package-overrides: - linear-circuit ==0.1.0.4 - linebreak ==1.1.0.1 - linenoise ==0.3.2 - - linux-capabilities ==0.1.0.0 + - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1430,7 +1431,7 @@ default-package-overrides: - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==2.0.0.0 - - list-t ==1.0.5.2 + - list-t ==1.0.5.3 - list-transformer ==1.0.8 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1484,7 +1485,7 @@ default-package-overrides: - massiv-persist ==1.0.0.3 - massiv-serialise ==1.0.0.2 - massiv-test ==1.0.0.0 - - mathexpr ==0.3.0.0 + - mathexpr ==0.3.1.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.2 - matplotlib ==0.7.7 @@ -1539,7 +1540,7 @@ default-package-overrides: - mintty ==0.1.4 - missing-foreign ==0.1.1 - MissingH ==1.5.0.1 - - mixed-types-num ==0.5.9.1 + - mixed-types-num ==0.5.10 - mmap ==0.5.9 - mmark ==0.0.7.6 - mmark-cli ==0.0.5.1 @@ -1660,7 +1661,7 @@ default-package-overrides: - network-wait ==0.1.2.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 - - nfc ==0.1.0 + - nfc ==0.1.1 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-derivation ==1.1.2 @@ -1749,7 +1750,7 @@ default-package-overrides: - pandoc ==2.17.1.1 - pandoc-csv2table ==1.0.9 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-lua-marshal ==0.1.6.1 + - pandoc-lua-marshal ==0.1.7 - pandoc-plot ==1.4.1 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22.2 @@ -1785,7 +1786,7 @@ default-package-overrides: - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - - pava ==0.1.1.3 + - pava ==0.1.1.4 - pcg-random ==0.1.3.7 - pcre2 ==2.1.1.1 - pcre-heavy ==1.0.0.2 @@ -2046,7 +2047,7 @@ default-package-overrides: - regex-pcre-builtin ==0.95.2.3.8.44 - regex-posix ==0.96.0.1 - regex-posix-clib ==2.7 - - regex-tdfa ==1.3.1.2 + - regex-tdfa ==1.3.1.4 - regex-with-pcre ==1.1.0.2 - reinterpret-cast ==0.1.0 - rel8 ==1.3.1.0 @@ -2070,7 +2071,7 @@ default-package-overrides: - resource-pool ==0.2.3.2 - resourcet ==1.2.6 - result ==0.2.6.0 - - retry ==0.9.2.1 + - retry ==0.9.3.0 - rev-state ==0.1.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 @@ -2117,7 +2118,7 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.9 + - sandwich ==0.1.0.10 - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.0.6 - say ==0.1.0.1 From 8aeb1d8ec5787dbadcc418c751247489386d827f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:00:36 +0200 Subject: [PATCH 08/62] all-cabal-hashes: 2022-07-18T21:55:34Z -> 2022-07-21T21:13:45Z 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 958478e86839..37ae9808bdd9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "f254a995da2ac1341f05d921778c064b49a5fcb2", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f254a995da2ac1341f05d921778c064b49a5fcb2.tar.gz", - "sha256": "136liqr85agwz0byvlp31r7in1nx28lm5y9kk7qy2jamspyf52hy", - "msg": "Update from Hackage at 2022-07-18T21:55:34Z" + "commit": "155a57bcfc019c9972a44be54a407d0329dfb436", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/155a57bcfc019c9972a44be54a407d0329dfb436.tar.gz", + "sha256": "17pqq15b936gf8vm1lb1kmnnlmjd61a5bfld9v3cs7ydz764kg8w", + "msg": "Update from Hackage at 2022-07-21T21:13:45Z" } From 28e9634a9dc5007266e668941b3f3a43dc044732 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:01:30 +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 | 919 ++++++++---------- 1 file changed, 416 insertions(+), 503 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f2872558e78..00bb29aa0b24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2069,8 +2069,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.0.2.2"; - sha256 = "1xj2m7hblaq1d5z9f4ygfwi23w1xvfmjjwrsm2m5kwkp10k5d19i"; + version = "1.0.2.3"; + sha256 = "1c113fdjwfbh01n3xsprya4dp6wc4m9xvilx9fyb3lbzdmmii624"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -14488,8 +14488,8 @@ self: { }: mkDerivation { pname = "NGLess"; - version = "1.4.1.1"; - sha256 = "0d2xkm6cw4g563d687bb6c3b971h72i0bf50k0arjkv9n7cp9sh9"; + version = "1.4.2.0"; + sha256 = "0578rjwi3xwikfaxha8yignr37adykqkbhspxds0c5bzwcw5zywh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -19688,8 +19688,8 @@ self: { }: mkDerivation { pname = "Spock-core"; - version = "0.14.0.0"; - sha256 = "0bcxngy33wap9py3y4f6kjysl31yjz3qmkp6z5z6pka80x9w3sf7"; + version = "0.14.0.1"; + sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie hashable http-api-data http-types hvect mmorph monad-control @@ -21638,8 +21638,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.0.0.0"; - sha256 = "0k4bg9shg8vklqhcd8ms9bpciwf4q1mip5m2agz3qj4056mrnjp9"; + version = "1.2.0.0"; + sha256 = "0zq7dxw050bj13mb7ayz144lxpwwhd424wzafnypn5i3vpmgldd6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -25049,27 +25049,6 @@ self: { }) {}; "aern2-mp" = callPackage - ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec - , integer-logarithms, mixed-types-num, QuickCheck, reflection - , regex-tdfa, template-haskell - }: - mkDerivation { - pname = "aern2-mp"; - version = "0.2.8.0"; - sha256 = "0nfd2r05jm93idsgijccxzqkkpjkpkn8jz3kqwanlma0x3wj02cj"; - libraryHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - testHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - description = "Multi-precision ball (interval) arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "aern2-mp_0_2_9_1" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell @@ -25088,30 +25067,9 @@ self: { ]; description = "Multi-precision ball (interval) arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aern2-real" = callPackage - ({ mkDerivation, aern2-mp, base, collect-errors, hspec - , integer-logarithms, mixed-types-num, QuickCheck - }: - mkDerivation { - pname = "aern2-real"; - version = "0.2.8.0"; - sha256 = "13nk4s5r7h7wg4q0x01f8aiy432zngynd5qbqsqi9fz149k7mik1"; - 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 sequences of MPBalls"; - license = lib.licenses.bsd3; - }) {}; - - "aern2-real_0_2_9_1" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: @@ -25129,7 +25087,6 @@ self: { ]; description = "Real numbers as convergent sequences of intervals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson_1_5_6_0" = callPackage @@ -38064,20 +38021,18 @@ self: { }) {}; "aws-arn" = callPackage - ({ mkDerivation, base, deriving-compat, hashable, lens, tasty - , tasty-discover, tasty-hunit, text + ({ mkDerivation, base, deriving-compat, hashable, profunctors + , tagged, tasty, tasty-discover, tasty-hunit, text }: mkDerivation { pname = "aws-arn"; - version = "0.1.0.1"; - sha256 = "0ml27685rjycrhc84sq41yniy15s2ak59cq5j1ybf9mxkwl52qcn"; - revision = "1"; - editedCabalFile = "1jm9g9fqyk2xr37kw52qghcpr9ak9nss1hnc3wy1lq2an42q1dpw"; + version = "0.2.0.0"; + sha256 = "1amqcycxncgcs7nvpxrr2f2r2g6dhyfmlcwsk2am8l9ncmrr8ijx"; libraryHaskellDepends = [ - base deriving-compat hashable lens text + base deriving-compat hashable profunctors tagged text ]; testHaskellDepends = [ - base deriving-compat lens tasty tasty-discover tasty-hunit text + base deriving-compat profunctors tagged tasty tasty-hunit text ]; testToolDepends = [ tasty-discover ]; description = "Types and optics for manipulating Amazon Resource Names (ARNs)"; @@ -40317,6 +40272,8 @@ self: { pname = "base64"; version = "0.4.2.4"; sha256 = "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4"; + revision = "1"; + editedCabalFile = "09jja484hzhnjfaz9whridrxsk799gyrg6qnvbpiy8q9c5cybfhi"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -51334,8 +51291,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.1.3"; - sha256 = "1zy2b86ns5jhrl6z6qw6g1zq5nv3lpf4askpr40l9gid61h6mr01"; + version = "0.1.1.4"; + sha256 = "0rgv66b26kjzl06xlh1x0l4xxc8a0fvzvj6jm9asya2wrmvs9z9m"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -54672,33 +54629,6 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, text-short, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.5.2.0"; - sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "9"; - editedCabalFile = "087489f6wx9gcr107xnw7pbmnwh9rkdqqk2sky3g43k87j2aqhbj"; - configureFlags = [ "-f-bytestring--lt-0_10_4" ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers deepseq hashable Only - scientific text text-short transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck - quickcheck-instances scientific test-framework test-framework-hunit - test-framework-quickcheck2 text unordered-containers vector - ]; - description = "A CSV parsing and encoding library"; - license = lib.licenses.bsd3; - }) {}; - - "cassava_0_5_3_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances , scientific, test-framework, test-framework-hunit @@ -54721,7 +54651,6 @@ self: { ]; description = "A CSV parsing and encoding library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cassava-conduit" = callPackage @@ -58085,24 +58014,6 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, criterion, hspec, primitive - , QuickCheck, quickcheck-instances, vector - }: - mkDerivation { - pname = "circular"; - version = "0.4.0.2"; - sha256 = "1wmm649rpjyy1w7k8zd4b8k52cb26i2jq4n6hszbspxp2bcvrnfs"; - libraryHaskellDepends = [ aeson base primitive vector ]; - testHaskellDepends = [ - aeson base hspec primitive QuickCheck quickcheck-instances vector - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Circular fixed-sized mutable vectors"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "circular_0_4_0_3" = callPackage ({ mkDerivation, aeson, base, criterion, hspec, primitive , QuickCheck, quickcheck-instances, vector }: @@ -58117,7 +58028,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -75373,6 +75283,35 @@ self: { broken = true; }) {}; + "dbmonitor" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, dhall + , directory, filepath, fsnotify, hasql, lifted-base, monad-control + , mtl, optparse-applicative, stm, telegram-bot-simple, text, time + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "dbmonitor"; + version = "0.1.0"; + sha256 = "02j2f6r7jkgmmxqxysz45api0ai8wic4dffhw0y1xxhwfw5cx023"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base bytestring dhall directory filepath + fsnotify hasql lifted-base monad-control mtl optparse-applicative + stm telegram-bot-simple text time transformers-base + unordered-containers vector + ]; + executableHaskellDepends = [ + ansi-terminal async base bytestring dhall directory filepath + fsnotify hasql lifted-base monad-control mtl optparse-applicative + stm telegram-bot-simple text time transformers-base + unordered-containers vector + ]; + description = "Data consistency alerting for PostgreSQL"; + license = lib.licenses.bsd3; + mainProgram = "dbmonitor"; + }) {}; + "dbus" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens @@ -76501,12 +76440,12 @@ self: { mainProgram = "deeplearning_demonstration"; }) {}; - "deepseq_1_4_7_0" = callPackage + "deepseq_1_4_8_0" = callPackage ({ mkDerivation, array, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.4.7.0"; - sha256 = "0sm00rsw714y73qr5zihz5fhxw0hahs6ksmf8wa60m1qwb9jcy9v"; + version = "1.4.8.0"; + sha256 = "0nk5hly70xb91q5pnq87yrwh0365kqj7iyhq5mbj8yhgwxr1661d"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ array base ghc-prim ]; description = "Deep evaluation of data structures"; @@ -81087,23 +81026,6 @@ self: { }) {}; "dirichlet" = callPackage - ({ mkDerivation, base, hspec, log-domain, math-functions - , mwc-random, primitive, vector - }: - mkDerivation { - pname = "dirichlet"; - version = "0.1.0.6"; - sha256 = "1awypb4ww1mgmvyd16hx1wxjws83slv65i3dc059b7w5nrmwqg49"; - libraryHaskellDepends = [ - base log-domain math-functions mwc-random primitive vector - ]; - testHaskellDepends = [ base hspec log-domain mwc-random vector ]; - description = "Multivariate Dirichlet distribution"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "dirichlet_0_1_0_7" = callPackage ({ mkDerivation, base, hspec, log-domain, math-functions , mwc-random, random, vector }: @@ -81117,7 +81039,6 @@ self: { testHaskellDepends = [ base hspec log-domain random vector ]; description = "Multivariate Dirichlet distribution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -84212,6 +84133,36 @@ self: { mainProgram = "dotenv"; }) {}; + "dotenv_0_9_0_3" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec + , optparse-applicative, process, shellwords, text + }: + mkDerivation { + pname = "dotenv"; + version = "0.9.0.3"; + sha256 = "163w2japbcdjzmhr7afq2rss7sp7gz2j8mylcc716x63gm3ws20h"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + shellwords text + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process shellwords text + ]; + testToolDepends = [ hspec-discover ]; + description = "Loads environment variables from dotenv files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "dotenv"; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -87347,10 +87298,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "1.0.0.0"; - sha256 = "0z1jnlmxwvacnira88rh5syd3p2rwy71cqb7nq4wlza43ym1vifa"; - revision = "1"; - editedCabalFile = "14y45ykqrxcl980rbn1pvzh7vldrg0hf55710544ssgbh9m71mrb"; + version = "1.1.0.0"; + sha256 = "0hfy27bgx57rga93jrj16laia65anhcks9b8xcwfsvc4zp3bsckh"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -87372,8 +87321,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "1.0.0.0"; - sha256 = "1mnwlq5i1y77f4p2jpyc6ciw600giz9g1n5rs0lwzwnbrjckqfp5"; + version = "1.1.0.0"; + sha256 = "1wglhfxmp7vcvyijdz9zmh8ai1q1k0a83d7klmiipxvym853w97b"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -87391,6 +87340,8 @@ self: { pname = "effectful-plugin"; version = "1.0.0.0"; sha256 = "11y9d1ylwhgrrwf0pcpjqix2vrwzbwr2rlma6rm0h8yqpkchbx81"; + revision = "1"; + editedCabalFile = "0878clqj18snfg7qlrpca21jy12w5b99d79gx6hkkw8pqi4x96x8"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -87407,6 +87358,8 @@ self: { pname = "effectful-th"; version = "1.0.0.0"; sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; + revision = "1"; + editedCabalFile = "0qpyaxkvz1h6z80zhiq80vs6hhgpp02faxxv5zyxkmi4ixf5arr2"; libraryHaskellDepends = [ base containers effectful exceptions template-haskell th-abstraction @@ -93645,6 +93598,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "explainable-predicates_0_1_2_2" = callPackage + ({ mkDerivation, array, base, doctest-exitcode-stdio, doctest-lib + , hspec, HUnit, mono-traversable, QuickCheck, regex-tdfa, syb + , template-haskell + }: + mkDerivation { + pname = "explainable-predicates"; + version = "0.1.2.2"; + sha256 = "16aajh4b6pg94y14581ppqlwhkb3qgz1d87zz6zjy7kbg8acrffa"; + libraryHaskellDepends = [ + array base HUnit mono-traversable QuickCheck regex-tdfa syb + template-haskell + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib hspec + ]; + description = "Predicates that can explain themselves"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "explicit-constraint-lens" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -101608,40 +101582,38 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, base, Blammo, bugsnag, bytestring - , case-insensitive, conduit, containers, datadog, directory - , doctest, ekg-core, envparse, errors, exceptions, extra, filepath - , Glob, hashable, hspec, hspec-core, hspec-expectations-lifted + , case-insensitive, conduit, containers, datadog, doctest, dotenv + , ekg-core, envparse, errors, exceptions, extra, filepath, Glob + , hashable, hspec, hspec-core, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, immortal, lens, lens-aeson - , load-env, memcache, monad-control, MonadRandom, mtl, network-uri + , memcache, monad-control, MonadRandom, mtl, network-uri , path-pieces, persistent, persistent-postgresql, postgresql-simple - , primitive, process, QuickCheck, resource-pool, retry, safe - , scientist, semigroupoids, template-haskell, temporary, text, time - , transformers, transformers-base, typed-process, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core + , primitive, QuickCheck, resource-pool, retry, safe, scientist + , semigroupoids, template-haskell, text, time, transformers + , transformers-base, typed-process, unliftio, unliftio-core + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.5.1.0"; - sha256 = "01qghpcgsh4fbszq7p21n1gk16v88bna2kr8aax81wl1iqabpyg1"; + version = "1.6.0.0"; + sha256 = "1ciqkqzif6hnasqhcmlhm5smq06mjh05l94v36413zv7ikcszygx"; libraryHaskellDepends = [ aeson base Blammo bugsnag bytestring case-insensitive conduit - containers datadog doctest ekg-core envparse errors exceptions - extra filepath Glob hashable hspec hspec-core + containers datadog doctest dotenv ekg-core envparse errors + exceptions extra filepath Glob hashable hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client - http-conduit http-link-header http-types immortal lens load-env - memcache monad-control MonadRandom mtl network-uri path-pieces - persistent persistent-postgresql postgresql-simple primitive - resource-pool retry safe scientist semigroupoids template-haskell - text time transformers transformers-base typed-process unliftio - unliftio-core unordered-containers vector wai wai-extra yaml - yesod-core + http-conduit http-link-header http-types immortal lens memcache + monad-control MonadRandom mtl network-uri path-pieces persistent + persistent-postgresql postgresql-simple primitive resource-pool + retry safe scientist semigroupoids template-haskell text time + transformers transformers-base typed-process unliftio unliftio-core + unordered-containers vector wai wai-extra yaml yesod-core ]; testHaskellDepends = [ - aeson base Blammo bytestring directory errors hspec http-types lens - lens-aeson memcache postgresql-simple process QuickCheck temporary - text time wai wai-extra + aeson base Blammo bugsnag bytestring errors hspec http-types lens + lens-aeson memcache postgresql-simple QuickCheck unliftio wai + wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -103735,25 +103707,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, containers, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, tasty-bench, transformers - }: - mkDerivation { - pname = "fused-effects"; - version = "1.1.1.3"; - sha256 = "046d6r1sbcqvinla14hhfb6f2ynryz5ixqzf4q2fjd3g0c4pfm88"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing - transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base tasty-bench transformers ]; - description = "A fast, flexible, fused effect system"; - license = lib.licenses.bsd3; - }) {}; - - "fused-effects_1_1_2_0" = callPackage ({ mkDerivation, base, containers, hedgehog, hedgehog-fn , inspection-testing, markdown-unlit, tasty-bench, transformers , unliftio-core @@ -103771,7 +103724,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -110831,25 +110783,6 @@ self: { }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-harfbuzz"; - version = "0.0.5"; - sha256 = "1kngcm03596cqz4djll1snmif2wdpkih0awkavcl2m63xcd86m4z"; - 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 = [ harfbuzz harfbuzz-gobject ]; - description = "HarfBuzz bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; - - "gi-harfbuzz_0_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 , gi-glib, gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -110868,7 +110801,6 @@ self: { libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage @@ -130137,6 +130069,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_6_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.6.0.1"; + sha256 = "164s6mwl1aq6r2i1qvdhcpr6mr3c8hffnkqzz07p46plysyzfs8f"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -130228,8 +130187,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3.1.1"; - sha256 = "1bc7l6l6ss9grgphnb0sks08v0wx0aalja4rkjzp49p5m6g82rc6"; + version = "0.3.1.2"; + sha256 = "165s21mw1j38xpzrqpg5nbgfa3gc9qw88b80d8cfdxdiyghn79hq"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -130285,8 +130244,8 @@ self: { }: mkDerivation { pname = "hasql-implicits"; - version = "0.1.0.4"; - sha256 = "1ls8ximzpgr3p4301xgxjfl17dff4ljpxwps205nblh1d7bkda6a"; + version = "0.1.0.5"; + sha256 = "10mfl1sa23zv7hgc0k1xykjxgrs4qjlmwdkxw38y0wn9b7zzpnlh"; libraryHaskellDepends = [ aeson base bytestring containers hasql network-ip scientific text time uuid vector @@ -130372,14 +130331,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-optparse-applicative_0_4" = callPackage + "hasql-optparse-applicative_0_4_0_1" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.4"; - sha256 = "1caw85628qw7vcs34nf74pra1zsc9mxnlgarhc2wam0bfjq2xabw"; + version = "0.4.0.1"; + sha256 = "1i2skl8zick54vf9hn169j1cmjgajiwvjdyxhdssisipjrczpqg8"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -130415,14 +130374,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_7_2" = callPackage + "hasql-pool_0_7_2_1" = callPackage ({ mkDerivation, base, hasql, hspec, rerebase, stm, time , transformers }: mkDerivation { pname = "hasql-pool"; - version = "0.7.2"; - sha256 = "068bbsybbjgdpq2vyzjfh6h1ayjcyws1flmdarb1bdq80nbdq2m9"; + version = "0.7.2.1"; + sha256 = "0rlnaan1ch8fr7z9jiznvpfabip070ibg1pqc4rircn2sw8773yb"; libraryHaskellDepends = [ base hasql stm time transformers ]; testHaskellDepends = [ hasql hspec rerebase stm ]; description = "A pool of connections for Hasql"; @@ -130671,6 +130630,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-th_0_4_0_17" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector + }: + mkDerivation { + pname = "hasql-th"; + version = "0.4.0.17"; + sha256 = "1s4ra8i4az6kik4ahfg3h0rzyz54fifn0dkabfpfxalg1ap5y7ic"; + libraryHaskellDepends = [ + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector + ]; + description = "Template Haskell utilities for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rerebase @@ -130689,6 +130667,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction_1_0_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rerebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1.0.1.2"; + sha256 = "0wqvxjrjgrmnbbassayyixa4sa5qw5iwwcrh5yz65dw20qf7m9rs"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + description = "Composable abstraction over retryable transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction-io" = callPackage ({ mkDerivation, base, bytestring, bytestring-tree-builder, hasql , mtl, resourcet, safe-exceptions, transformers, unliftio-core @@ -134092,8 +134089,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.6"; - sha256 = "1viy6h0jslhr5ln06g1yqmgqjr36yl6014v8m2fzlnszga761v6y"; + version = "0.9.7"; + sha256 = "1pgzgmjc025n9if2hq84i4d9syrz7fskzvyy5ilz4h49vqnjngcq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134307,8 +134304,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.0"; - sha256 = "0h4igygjmi8z9dyfidizs04f9yhnibdba523h8996lf7s2dxb6g9"; + version = "0.3.3.1"; + sha256 = "12dar9i4kbils7f03almhlarhjysgh2zqsq24xqrsz6fwdcdn5v6"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -134653,25 +134650,6 @@ self: { }) {}; "heterocephalus" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist - , doctest, Glob, mtl, parsec, shakespeare, template-haskell - , template-haskell-compat-v0208, text, transformers - }: - mkDerivation { - pname = "heterocephalus"; - version = "1.0.5.6"; - sha256 = "15bgmgnyrf721d0a3bpmvbz723a79hbh56wa6a2v087v3qrlx05g"; - libraryHaskellDepends = [ - base blaze-html blaze-markup containers dlist mtl parsec - shakespeare template-haskell template-haskell-compat-v0208 text - transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - description = "A type-safe template engine for working with front end development tools"; - license = lib.licenses.mit; - }) {}; - - "heterocephalus_1_0_5_7" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist , doctest, Glob, mtl, parsec, shakespeare, template-haskell , template-haskell-compat-v0208, text, transformers @@ -134688,7 +134666,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A type-safe template engine for working with front end development tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "heterogeneous-list-literals" = callPackage @@ -138990,19 +138967,17 @@ self: { }) {}; "hlrdb" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite - , hashable, hedis, hlrdb-core, memory, random, store, time + ({ mkDerivation, base, base64, bytestring, cryptonite, hashable + , hedis, hlrdb-core, memory, random, store, time , unordered-containers, zstd }: mkDerivation { pname = "hlrdb"; - version = "0.3.2.0"; - sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p"; - revision = "3"; - editedCabalFile = "1r8dmsfbsm4lhak2hskid03bad2fvnb71v779grzf5hy6y46jc42"; + version = "0.4.0.0"; + sha256 = "0cj2ff40n3v171xhvdips3als1f2x91ksxcqm7i570mwkdgbh1jr"; libraryHaskellDepends = [ - base base64-bytestring bytestring cryptonite hashable hedis - hlrdb-core memory random store time unordered-containers zstd + base base64 bytestring cryptonite hashable hedis hlrdb-core memory + random store time unordered-containers zstd ]; description = "High-level Redis Database"; license = lib.licenses.mit; @@ -172898,21 +172873,6 @@ self: { }) {}; "lens-family" = callPackage - ({ mkDerivation, base, containers, lens-family-core, mtl - , transformers - }: - mkDerivation { - pname = "lens-family"; - version = "2.1.1"; - sha256 = "1ra31r3y672nyqf7147kxws1qvksgics8pgd6fasyf1v0l3c798j"; - libraryHaskellDepends = [ - base containers lens-family-core mtl transformers - ]; - description = "Lens Families"; - license = lib.licenses.bsd3; - }) {}; - - "lens-family_2_1_2" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers }: @@ -172925,21 +172885,9 @@ self: { ]; description = "Lens Families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-family-core" = callPackage - ({ mkDerivation, base, containers, transformers }: - mkDerivation { - pname = "lens-family-core"; - version = "2.1.0"; - sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v"; - libraryHaskellDepends = [ base containers transformers ]; - description = "Haskell 2022 Lens Families"; - license = lib.licenses.bsd3; - }) {}; - - "lens-family-core_2_1_2" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "lens-family-core"; @@ -172948,7 +172896,6 @@ self: { libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 2022 Lens Families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-family-th" = callPackage @@ -176248,17 +176195,6 @@ self: { }) {blkid = null;}; "linux-capabilities" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "linux-capabilities"; - version = "0.1.0.0"; - sha256 = "033mnbxg9bzi3cc4js22gpi96g5yslv6sksxdsgab5k075gad85k"; - libraryHaskellDepends = [ base ]; - description = "Linux capabilities Haskell data type"; - license = lib.licenses.asl20; - }) {}; - - "linux-capabilities_0_1_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "linux-capabilities"; @@ -176267,7 +176203,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Linux capabilities Haskell data type"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "linux-cgroup" = callPackage @@ -176974,24 +176909,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.5.2"; - sha256 = "0478iigfrkinhkjyq9zc4xvrbzcfvq46s6k0bj4a2sy8j41jzgww"; - libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = lib.licenses.mit; - }) {}; - - "list-t_1_0_5_3" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, semigroups, transformers , transformers-base @@ -177007,7 +176924,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -183922,17 +183838,6 @@ self: { }) {}; "mathexpr" = callPackage - ({ mkDerivation, base, data-default-class }: - mkDerivation { - pname = "mathexpr"; - version = "0.3.0.0"; - sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3"; - libraryHaskellDepends = [ base data-default-class ]; - description = "Parse and evaluate math expressions with variables and functions"; - license = lib.licenses.gpl3Only; - }) {}; - - "mathexpr_0_3_1_0" = callPackage ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "mathexpr"; @@ -183941,7 +183846,6 @@ self: { libraryHaskellDepends = [ base data-default-class ]; description = "Parse and evaluate math expressions with variables and functions"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mathflow" = callPackage @@ -188584,25 +188488,6 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.5.9.1"; - sha256 = "009hsagx0g1myf2jlljqnf96mwnz3a4jbcmrcjs0lizskprzj1n2"; - libraryHaskellDepends = [ - base collect-errors hspec hspec-smallcheck mtl QuickCheck - smallcheck template-haskell - ]; - testHaskellDepends = [ - base collect-errors hspec hspec-smallcheck QuickCheck smallcheck - ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_5_10" = callPackage ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl , QuickCheck, smallcheck, template-haskell }: @@ -188619,7 +188504,6 @@ self: { ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -197201,13 +197085,13 @@ self: { }) {}; "nat-optics" = callPackage - ({ mkDerivation, base, optics-core, text }: + ({ mkDerivation, base, hspec, optics-core, text }: mkDerivation { pname = "nat-optics"; - version = "1.0.0.2"; - sha256 = "12m6267dirzykj4d0rjqq5h3n2zrnp7ixavryvbgqdvrnk6y2ik4"; + version = "1.0.0.3"; + sha256 = "1anvn1p4zp8qwc7pasvx1xvglncjbz7p45x4i7rzj2zdz7qcs4nq"; libraryHaskellDepends = [ base optics-core text ]; - testHaskellDepends = [ base optics-core text ]; + testHaskellDepends = [ base hspec optics-core text ]; description = "Refinement types for natural numbers with an optics interface"; license = lib.licenses.mit; }) {}; @@ -197990,8 +197874,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.2.1"; - sha256 = "052y6mqj8bgfyjv7bxm5vyhd14bpg694ybji2ar2zww30jx5g6ib"; + version = "0.8.2.2"; + sha256 = "1aadyks5id0pb9kz2ydqvy0sp6v5kliv9khmn1s47vvsb920zqy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200267,23 +200151,6 @@ self: { }) {}; "nfc" = callPackage - ({ mkDerivation, base, bytestring, c2hs, nfc }: - mkDerivation { - pname = "nfc"; - version = "0.1.0"; - sha256 = "0rqin2my3g44xnjvilgri03ip1wqw3235dcay0fhrqn96kag3f33"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ nfc ]; - libraryToolDepends = [ c2hs ]; - description = "libnfc bindings"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {nfc = null;}; - - "nfc_0_1_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, libnfc }: mkDerivation { pname = "nfc"; @@ -200871,8 +200738,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.3.0.0"; - sha256 = "11fn65swyj7b3l7xs6rws81nnccr2hcf81igqmna5bwck3g2gklw"; + version = "0.4.0.0"; + sha256 = "06l897sl59pq5qvqwic2w57cd9s5b9iimzlx4l6d9krwsqzqipy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202093,8 +201960,8 @@ self: { }: mkDerivation { pname = "notmuch"; - version = "0.3.0.0"; - sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn"; + version = "0.3.0.1"; + sha256 = "0dns7h8fh5ddd77wysys5x9qialz7bqj9h76qj3fy34145d7wlq4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203051,6 +202918,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "numhask-array_0_10_1" = callPackage + ({ mkDerivation, adjunctions, base, distributive, numhask, vector + }: + mkDerivation { + pname = "numhask-array"; + version = "0.10.1"; + sha256 = "0c8zvlx5w6zjjxcnsc6jl7pbmfr1p4823jpcyzvx72kzzms16x5b"; + libraryHaskellDepends = [ + adjunctions base distributive numhask vector + ]; + description = "Multi-dimensional arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "numhask-free" = callPackage ({ mkDerivation, attoparsec, base, containers, doctest, free , numhask, text @@ -204461,8 +204343,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "2.0.0.0"; - sha256 = "0xg9wcmgsxc0rn9fvdma8zs3a588qsppcrxbvpnaa5j1h70nh2qb"; + version = "2.0.0.2"; + sha256 = "0p9g6638z693jd2gz0bq7i03zqyfq5dql5ym8jagszhdygrccy98"; libraryHaskellDepends = [ base bytestring Cabal containers directory http-types safe safe-exceptions template-haskell text unix wai @@ -204929,6 +204811,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_9_3_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.9.3.1"; + sha256 = "1mgyjg2gzs2l6941561bhk29wqv9fj81g7q4wlkkaxszg9w2lkww"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -207297,8 +207209,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ordering-util"; - version = "0.1.3.1"; - sha256 = "1f9dkrap8v9fpkj0s2991gqzi6hwascmx2g3n44njg4nn8r2an69"; + version = "0.1.3.2"; + sha256 = "1na61sq78r190lcn4lw437mj5wcdq9p53zn3vbz16w3b1vwdwfii"; libraryHaskellDepends = [ base ]; description = "Utilities for Orderings"; license = lib.licenses.mit; @@ -209282,28 +209194,6 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, hslua - , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty - , tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; - version = "0.1.6.1"; - sha256 = "0di12wk3hfz85gyqypaxk3lsl0w3lylmza0lip0d7a257vis2lpz"; - libraryHaskellDepends = [ - base bytestring containers exceptions hslua hslua-marshalling lua - pandoc-types safe text - ]; - testHaskellDepends = [ - base bytestring containers exceptions hslua hslua-marshalling lua - pandoc-types QuickCheck safe tasty tasty-hunit tasty-lua - tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_1_7" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hslua , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty , tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -209323,7 +209213,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -209888,6 +209777,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.6"; + sha256 = "18xz441274hrlrwbwfd39baddrmi95dg9ykcnhwmh37yhkvm1i1z"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -212437,20 +212368,6 @@ self: { }) {}; "pava" = callPackage - ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: - mkDerivation { - pname = "pava"; - version = "0.1.1.3"; - sha256 = "07k8kgzz4rscpg716f72my1xcl1sr1g4laky3xjrk3vh1gzn1g88"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec vector ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - description = "Greatest convex majorants and least concave minorants"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "pava_0_1_1_4" = callPackage ({ mkDerivation, base, criterion, hspec, mwc-random, random, vector }: mkDerivation { @@ -212464,7 +212381,6 @@ self: { ]; description = "Greatest convex majorants and least concave minorants"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -214254,7 +214170,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_0_2" = callPackage + "persistent_2_14_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -214265,8 +214181,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.0.2"; - sha256 = "05sa38bmzkd12lrv6lzyj0mgd65sj81prpkyy9z0qsjywxksw8d5"; + version = "2.14.0.3"; + sha256 = "0r0pz7badjb2m47prhgs3hpwfcwqg07nimbwhnhc7mx3n0n2sjp6"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -214931,6 +214847,24 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-stm" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , extra, filelock, filepath, focus, hspec, stm, stm-containers + , temporary + }: + mkDerivation { + pname = "persistent-stm"; + version = "0.1.0.2"; + sha256 = "1z1nb0k2kdy9bd5jbkm2gw78n5qyc61wgpb6iq5wpz7rnvvvplj0"; + libraryHaskellDepends = [ + base binary bytestring containers directory extra filelock filepath + focus stm stm-containers + ]; + testHaskellDepends = [ base hspec stm temporary ]; + description = "STM transactions involving persistent storage"; + license = lib.licenses.bsd3; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -228497,25 +228431,24 @@ self: { "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck - , quickcheck-instances, random, semigroupoids, semigroups - , stringsearch, tasty, tasty-golden, tasty-hedgehog, tasty-hunit - , tasty-quickcheck, text, time + , quickcheck-instances, random, semigroupoids, stringsearch, tasty + , tasty-golden, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text + , time }: mkDerivation { pname = "purebred-email"; - version = "0.5"; - sha256 = "0ibnykfqs438fhpwcq0yqkdnr67rql7ss07fcr5qckr4zxaw8ba1"; + version = "0.5.1"; + sha256 = "1g64z0ibbp5sq9m1jmxks5l89rdmdg8szidclxwz2xs0ilzsy65m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive - concise deepseq lens random semigroupoids semigroups stringsearch - text time + concise deepseq lens random semigroupoids stringsearch text time ]; testHaskellDepends = [ attoparsec base bytestring case-insensitive hedgehog lens - QuickCheck quickcheck-instances random semigroups tasty - tasty-golden tasty-hedgehog tasty-hunit tasty-quickcheck text time + QuickCheck quickcheck-instances random tasty tasty-golden + tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; @@ -236360,8 +236293,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.2.0.0"; - sha256 = "1l7ksf11352llcy6fzap3hsq9vgv99gs948ha5i1vvz9bjvn2qwg"; + version = "0.2.0.1"; + sha256 = "1ch5k278sd7dqx1fhd0ginbm3xn7x70jazniycvy7n6z1nqbr8lk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236992,20 +236925,19 @@ self: { "regex-tdfa" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, mtl, parsec, regex-base, text, utf8-string + , doctest-parallel, filepath, mtl, parsec, regex-base, text + , utf8-string }: mkDerivation { pname = "regex-tdfa"; - version = "1.3.1.2"; - sha256 = "0qka53m4xirlb2cjzr68rhybm31i4x2f78b8724a0askvb4phyn4"; - revision = "1"; - editedCabalFile = "02hq7zymsybnmm9qmlsj7fdh02dch6001nm348ymabvlwjndxbwv"; + version = "1.3.1.4"; + sha256 = "0ksdfkf2avjfvd4g0mm6kacgrd7sclj7z9zd7vgkwj7q5vafhpgy"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; testHaskellDepends = [ - array base bytestring containers directory filepath mtl regex-base - text utf8-string + array base bytestring containers directory doctest-parallel + filepath mtl regex-base text utf8-string ]; description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; @@ -239282,6 +239214,31 @@ self: { license = lib.licenses.mit; }) {}; + "reroute_0_7_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, graph-core, hashable + , hspec, http-api-data, hvect, mtl, random, regex-compat, text + , unordered-containers, vector + }: + mkDerivation { + pname = "reroute"; + version = "0.7.0.0"; + sha256 = "046pszxz2mp0glss03ifk1617i1w15cm5x0jy2iwg5a905vdis3s"; + libraryHaskellDepends = [ + base deepseq hashable http-api-data hvect mtl text + unordered-containers + ]; + testHaskellDepends = [ + base hspec hvect mtl text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq graph-core hashable http-api-data hvect mtl + random regex-compat text unordered-containers vector + ]; + description = "abstract implementation of typed and untyped web routing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rescue" = callPackage ({ mkDerivation, base, criterion, directory, directory-tree , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core @@ -240200,26 +240157,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl - , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time - , transformers - }: - mkDerivation { - pname = "retry"; - version = "0.9.2.1"; - sha256 = "0x6aa0mrj7m68wrbnml6bv852xxy5992qc69c2v5ipbjli560ak5"; - libraryHaskellDepends = [ - base exceptions ghc-prim mtl mtl-compat random transformers - ]; - testHaskellDepends = [ - base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm - tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = lib.licenses.bsd3; - }) {}; - - "retry_0_9_3_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers, unliftio-core @@ -240238,7 +240175,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "retryer" = callPackage @@ -245044,49 +244980,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, 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.0.9"; - sha256 = "07knl1kpbg85df08q07byjid26bkgk514pngkf58h9wy4y5l5il7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - 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 lens - 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 lens - 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; - }) {}; - - "sandwich_0_1_0_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lens, lifted-async, microlens @@ -245127,7 +245020,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -252699,8 +252591,8 @@ self: { }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.4"; - sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; + version = "1.0.5"; + sha256 = "185s39b1km45zf5ghzwl5vpbwwpna1xrfqcqdfgxv88zlksr9vfb"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -252722,8 +252614,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.5"; - sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; + version = "2.0.0"; + sha256 = "11zcncppswgx7cd9ihr6nm91574f7azsqbdcra9p2c2fqm191dvg"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -252748,8 +252640,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.4"; - sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; + version = "1.0.5"; + sha256 = "0kwarhb9xgffw4jdmvz8zc6k67swz1v6dphb8xx9kngbxq9z44in"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -252798,6 +252690,24 @@ self: { license = lib.licenses.mit; }) {}; + "serversession-frontend-wai_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, cookie, data-default + , path-pieces, serversession, text, time, transformers + , unordered-containers, vault, wai, wai-session + }: + mkDerivation { + pname = "serversession-frontend-wai"; + version = "1.0.1"; + sha256 = "0n6id58ppf8lmjndkgji0qbkw8427zg89sgv1vgnhh4z9ydfh0zm"; + libraryHaskellDepends = [ + base bytestring cookie data-default path-pieces serversession text + time transformers unordered-containers vault wai wai-session + ]; + description = "wai-session bindings for serversession"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "serversession-frontend-yesod" = callPackage ({ mkDerivation, base, bytestring, containers, cookie, data-default , path-pieces, serversession, text, time, transformers @@ -254680,8 +254590,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.3.0"; - sha256 = "0n5miyicjirpkh5p9vgcxb75jh4n6g8lxhrzxpm8fggmv8z0gm1s"; + version = "0.1.3.1"; + sha256 = "1j7skcylpsi4xjh3icp5mvcr1434bcsf8dvha3wd6znn2s2k7wgb"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec ]; description = "Parse strings into words, like a shell would"; @@ -275829,8 +275739,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.2"; - sha256 = "0lksanhb1nsk45vqg1h9jigllfg0lrqsynxkplh8lyx6g8k0naav"; + version = "0.1.0.3"; + sha256 = "0qq8q31vzmh1ssiiwkaacw0n7kmjqff8w74n8vyjypbxmsq4gwq1"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -292181,16 +292091,16 @@ self: { license = lib.licenses.mit; }) {}; - "universum_1_8_0" = callPackage + "universum_1_8_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, gauge , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl - , safe-exceptions, stm, tasty, tasty-hedgehog, text, transformers - , unordered-containers, utf8-string, vector + , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text + , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.0"; - sha256 = "0kq41glz96318bxgwy8l5vqn9d9ha6bsbzgd2kjzlxxn6y7zvwr6"; + version = "1.8.1"; + sha256 = "1193xyz1n8ma4l2p07g764zd87yzr3qv8lnfxhih7zh9r0lywd6y"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -292199,6 +292109,7 @@ self: { testHaskellDepends = [ base bytestring hedgehog tasty tasty-hedgehog text ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base containers gauge text unordered-containers ]; @@ -298918,6 +298829,8 @@ self: { pname = "wai-middleware-auth"; version = "0.2.6.0"; sha256 = "0ji0jywippk9vqdcbv79fy79xl20p91h8wdadmxa684m5mj95b6x"; + revision = "1"; + editedCabalFile = "0jivjypzh6331hk2y5rb1cyf27qmxdmwc2a3p1cjmc7636h1il4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309786,8 +309699,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.23.1"; - sha256 = "1s9wa9xw9ximivwv9bk7lf4w20yhlcy8vyp2i3j6w4fig918qxg9"; + version = "1.6.24.0"; + sha256 = "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra From aa41b54e51af9683b7f8e60563e6a0642ae2e6fa Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 21 Jul 2022 14:59:47 -0700 Subject: [PATCH 10/62] haskellPackages.aeson-typescript: fix the testsuite and unbreak --- .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 10 ++++++++++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e1b480c5b026..499ae9bf956b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -94,7 +94,6 @@ broken-packages: - aeson-streams - aeson-t - aeson-toolkit - - aeson-typescript - aeson-utils - aeson-via - aeson-with diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f16a2c439f1a..09336b009cf0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -858,6 +858,16 @@ self: super: builtins.intersectAttrs super { ); hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; + # the testsuite fails because of not finding tsc without some help + aeson-typescript = overrideCabal (drv: { + testToolDepends = drv.testToolDepends or [] ++ [ pkgs.nodePackages.typescript ]; + # the testsuite assumes that tsc is in the PATH if it thinks it's in + # CI, otherwise trying to install it. + # + # https://github.com/codedownio/aeson-typescript/blob/ee1a87fcab8a548c69e46685ce91465a7462be89/test/Util.hs#L27-L33 + preCheck = "export CI=true"; + }) super.aeson-typescript; + # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. # Flag added in Agda 2.6.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4a8d1e8711ce..d8b4362a7e21 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26172,8 +26172,6 @@ self: { ]; description = "Generate TypeScript definition files from your ADTs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-typescript_0_4_0_0" = callPackage From 8d90d114b2a5639e21531c7f1d0ab1ff7b6feb0e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 24 Jul 2022 19:11:35 +0200 Subject: [PATCH 11/62] haskellPackages.doctest-parallel: Disable defective doctests --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d3ace213c00b..3e5834f67dcd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2577,6 +2577,14 @@ self: super: { # https://github.com/klapaucius/vector-hashtables/issues/11 vector-hashtables = doJailbreak super.vector-hashtables; + # doctests don‘t work. + doctest-parallel = dontCheck super.doctest-parallel; + + # Disabling doctests. + regex-tdfa = overrideCabal { + testTarget = "regex-tdfa-unittest"; + } super.regex-tdfa; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 335397c4ea72..79765953e2e2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1176,7 +1176,6 @@ broken-packages: - dockerfile-creator - docrecords - doctest-discover-configurator - - doctest-parallel - doctest-prop - docusign-example - docvim diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7bdfe3bc4618..90ae511dee2b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26153,7 +26153,6 @@ self: { description = "Generate TypeScript definition files from your ADTs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-utils" = callPackage @@ -83586,8 +83585,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "doctest-prop" = callPackage From e8f7667f40c9fc6c0f5d159e94b85f2686d87701 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 00:34:58 +0000 Subject: [PATCH 12/62] python310Packages.cssutils: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/cssutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 0e2fbb601eeb..0cb99dfee1c6 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-1H5N1nsowm/5oeVBEV3u05YX/5JlERxtJQD3qBcHeVs="; + hash = "sha256-tKTaWOeDJuyfSp01VQBN33BvPpn3oQJsGIDwk0NiuLQ="; }; nativeBuildInputs = [ From ce3ffd90358647f0457a08b62a19281c25e1d3fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 09:59:45 +0000 Subject: [PATCH 13/62] python310Packages.dvc-objects: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 589ec159684f..916ddf52797f 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fFpRrFRa1VcVdc/uIJZ+DR74ivttRKkXgibXV3q72qY="; + hash = "sha256-vRQhlxaNy0bJTkNVlGZ+c9ocnzG/jeZYCxCabMuI5Ag="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 694b7652aabddca3b424dbc2646eeca2363414ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 10:50:23 +0000 Subject: [PATCH 14/62] python310Packages.zigpy: 0.47.3 -> 0.48.0 --- 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 49885355383b..65532ed23c4b 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.47.3"; + version = "0.48.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-iEPE4YPpIJK4xZMT4SFKZ2tu61TiehB9HP81Jo3pg30="; + sha256 = "sha256-usO5d2JLZ7tochQXmxEfRgxaW1KJew3RVbfWnew+bP4="; }; propagatedBuildInputs = [ From 0d7a058a1c0931de7218d3d145b0256a22be4936 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 13:29:18 +0000 Subject: [PATCH 15/62] python310Packages.dominate: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/dominate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 3f0cca295dcb..61662c596fd4 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"; + sha256 = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; doCheck = !isPy3k; From 5d05bbed745b0e33098091a6852e6e7884eeb5de Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 25 Jul 2022 16:20:30 +0200 Subject: [PATCH 16/62] binutils: fix the kernel build for PowerPC --- .../tools/misc/binutils/default.nix | 11 ++++ .../ppc-make-machine-less-strict.patch | 51 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 4457db094301..a25c1ce87b07 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -105,6 +105,17 @@ stdenv.mkDerivation { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) + # On PowerPC, when generating assembly code, GCC generates a `.machine` + # custom instruction which instructs the assembler to generate code for this + # machine. However, some GCC versions generate the wrong one, or make it + # too strict, which leads to some confusing "unrecognized opcode: wrtee" + # or "unrecognized opcode: eieio" errors. + # + # To remove when binutils 2.39 is released. + # + # Upstream commit: + # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553 + ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch ; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch b/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch new file mode 100644 index 000000000000..c2452414fc7d --- /dev/null +++ b/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch @@ -0,0 +1,51 @@ +From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 21 Feb 2022 10:58:57 +1030 +Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel + +Commit b25f942e18d6 made .machine more strict. Weaken it again. + + * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, + keeping sticky options to work around gcc bugs. +--- + gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 054f9c72161..89bc7d3f9b9 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) + options do not count as a new machine, instead they add + to currently selected opcodes. */ + ppc_cpu_t machine_sticky = 0; +- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); ++ /* Unfortunately, some versions of gcc emit a .machine ++ directive very near the start of the compiler's assembly ++ output file. This is bad because it overrides user -Wa ++ cpu selection. Worse, there are versions of gcc that ++ emit the *wrong* cpu, not even respecting the -mcpu given ++ to gcc. See gcc pr101393. And to compound the problem, ++ as of 20220222 gcc doesn't pass the correct cpu option to ++ gas on the command line. See gcc pr59828. Hack around ++ this by keeping sticky options for an early .machine. */ ++ asection *sec; ++ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) ++ { ++ segment_info_type *info = seg_info (sec); ++ /* Are the frags for this section perturbed from their ++ initial state? Even .align will count here. */ ++ if (info != NULL ++ && (info->frchainP->frch_root != info->frchainP->frch_last ++ || info->frchainP->frch_root->fr_type != rs_fill ++ || info->frchainP->frch_root->fr_fix != 0)) ++ break; ++ } ++ new_cpu = ppc_parse_cpu (ppc_cpu, ++ sec == NULL ? &sticky : &machine_sticky, ++ cpu_string); + if (new_cpu != 0) + ppc_cpu = new_cpu; + else +-- +2.31.1 From 3464d0cc1927e1f5caa9e8d9ec281375aec42e47 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 12 May 2022 21:24:42 +0200 Subject: [PATCH 17/62] modemmanager: 1.18.6 -> 1.18.8 --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index c9d56044b0dc..6abef47ca396 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.6"; + version = "1.18.8"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-1PgEsxz1BCOcXx1Jc8YglcAMuh7pq7UDcY2sbRRqRwo="; + sha256 = "sha256-4w38Y6Tlk7s7e6VVNGw+3Dx+EdTWLvzeUaxDjvRBsCA="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From 01ad520de45feb4fce31186e655776b791685678 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 20:30:52 +0200 Subject: [PATCH 18/62] =?UTF-8?q?libqmi:=201.30.4=20=E2=86=92=201.30.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/libqmi-devel/2022-June/003787.html https://lists.freedesktop.org/archives/libqmi-devel/2022-April/003786.html --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index fb2d4aa69c9c..b261967f5cf2 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.4"; + version = "1.30.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-ANfaMKT40RhfN8uiic+vHfzQSljy921qz99bhTEtbtY="; + sha256 = "sha256-hiSCzp460L1l0mQzTuMRzblLnfKGO1txNjCbQbisGZA="; }; nativeBuildInputs = [ From e9e726b4597104af63531bdee8fa7cc062d6821c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 20:42:25 +0200 Subject: [PATCH 19/62] =?UTF-8?q?libqrtr-glib:=201.0.0=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/libqmi-devel/2021-November/003721.html https://lists.freedesktop.org/archives/libqmi-devel/2022-February/003762.html --- .../libraries/libqrtr-glib/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix index aefc61f1ccf7..e7445468ecc3 100644 --- a/pkgs/development/libraries/libqrtr-glib/default.nix +++ b/pkgs/development/libraries/libqrtr-glib/default.nix @@ -1,6 +1,8 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, ninja , pkg-config , gobject-introspection , gtk-doc @@ -11,13 +13,16 @@ stdenv.mkDerivation rec { pname = "libqrtr-glib"; - version = "1.0.0"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqrtr-glib"; + rev = version; + sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; }; strictDeps = true; @@ -27,6 +32,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection gtk-doc @@ -38,8 +45,8 @@ stdenv.mkDerivation rec { glib ]; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - "--enable-gtk-doc" + mesonFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dgtk_doc=false" ]; meta = with lib; { From 650b3f97cdd5df699b64adf170058aae6e1771b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 20:51:28 +0200 Subject: [PATCH 20/62] =?UTF-8?q?libmbim:=201.26.2=20=E2=86=92=201.26.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/libmbim-devel/2022-April/001188.html --- pkgs/development/libraries/libmbim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 5a57dfb578de..eb32fca71641 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.26.2"; + version = "1.26.4"; + + outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-EMd79bXrjJK6gOm1GZI62biYNivI4ZKOK8mhfuumSa8="; + sha256 = "sha256-9ojOxMRYahdXX14ydEjOYvIADvagfJ5FiYc9SmhWitk="; }; - outputs = [ "out" "dev" "man" ]; - configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" (lib.enableFeature withIntrospection "introspection") From 86ea7505dca6b42e7b70baedeb73fc51dc197c51 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 20:55:12 +0200 Subject: [PATCH 21/62] =?UTF-8?q?modemmanager:=201.18.8=20=E2=86=92=201.18?= =?UTF-8?q?.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/modemmanager-devel/2022-June/009304.html --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 6abef47ca396..76459d6d82d0 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.8"; + version = "1.18.10"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-4w38Y6Tlk7s7e6VVNGw+3Dx+EdTWLvzeUaxDjvRBsCA="; + sha256 = "sha256-FiVfginu6y3+y43RNwNg1G8QFeyF5vulwcvZ9DcdZes="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From 6156f371558791c15eba1b675ea2b36dce7b62f0 Mon Sep 17 00:00:00 2001 From: Jakob Neufeld Date: Mon, 25 Jul 2022 17:19:17 +0200 Subject: [PATCH 22/62] navi: 2.19.0 -> 2.20.1 --- pkgs/applications/misc/navi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 30adf58a49fd..90350c03f413 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.19.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-tbnhbjtrVlxx21L15UocUSwvUesl5D/QoM/2r55rwOo="; + sha256 = "sha256-uu82KG2RHEP0PstoYB4eWZWFjlousT40A1XAaBfkjFE="; }; - cargoSha256 = "sha256-X5t5mJoda8xTIVw3+u6yOvp78lS4rW3Ud6d/4ttsNbc="; + cargoSha256 = "sha256-gpHeyxLcDqwi96BWF6Hwlb27JG2LSUgfsE4FTB1vIoQ="; nativeBuildInputs = [ makeWrapper ]; From b5c72110b652e6123b4eae5c95a6df682101e47b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Jul 2022 15:48:53 +0000 Subject: [PATCH 23/62] python310Packages.vallox-websocket-api: 2.11.0 -> 2.12.0 --- .../python-modules/vallox-websocket-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 53af2f0dd9fc..821dbb19e635 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "2.11.0"; + version = "2.12.0"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; - rev = version; - hash = "sha256-wZiPrPl9ESp43PFdRPvqB2nOg+ogfaArunZOR3Q9cvs="; + rev = "refs/tags/${version}"; + hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20="; }; propagatedBuildInputs = [ From 7cfe5b129a8d60652ff8456343db65d48f77b346 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Wed, 13 Jul 2022 10:17:48 +0200 Subject: [PATCH 24/62] ithc: init at unstable-2022-06-07 --- pkgs/os-specific/linux/ithc/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/os-specific/linux/ithc/default.nix diff --git a/pkgs/os-specific/linux/ithc/default.nix b/pkgs/os-specific/linux/ithc/default.nix new file mode 100644 index 000000000000..69b202e7e201 --- /dev/null +++ b/pkgs/os-specific/linux/ithc/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "ithc"; + version = "unstable-2022-06-07"; + + src = fetchFromGitHub { + owner = "quo"; + repo = "ithc-linux"; + rev = "5af2a2213d2f3d944b19ec7ccdb96f16d56adddb"; + hash = "sha256-p4TooWUOWPfNdePE18ESmRJezPDAl9nLb55LQtkJiSg="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "VERSION=${version}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + postPatch = '' + sed -i ./Makefile -e '/depmod/d' + ''; + + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + + meta = with lib; { + description = "Linux driver for Intel Touch Host Controller"; + homepage = "https://github.com/quo/ithc-linux"; + license = licenses.publicDomain; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "5.9"; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fc8ebc60823f..f47bb5115a94 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -487,6 +487,8 @@ in { xpadneo = callPackage ../os-specific/linux/xpadneo { }; + ithc = callPackage ../os-specific/linux/ithc { }; + zenpower = callPackage ../os-specific/linux/zenpower { }; inherit (callPackage ../os-specific/linux/zfs { From 759fed34c0edd7749d394534a5bd1a7f5f8ff9f7 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 25 Jul 2022 22:58:13 +0200 Subject: [PATCH 25/62] haskellPackages.hls-ormolu-plugin: Disable flaky test --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 09336b009cf0..c39a4d59d1a0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -988,7 +988,6 @@ self: super: builtins.intersectAttrs super { hls-floskell-plugin hls-fourmolu-plugin hls-module-name-plugin - hls-ormolu-plugin hls-pragmas-plugin hls-splice-plugin; # Tests have file permissions expections that don‘t work with the nix store. @@ -1004,6 +1003,7 @@ self: super: builtins.intersectAttrs super { hls-tactics-plugin = dontCheck super.hls-tactics-plugin; hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; # Wants to execute cabal-install to (re-)build itself hint = dontCheck super.hint; From f39aee2d8b8cf527a4a13f90bd57c8ceb345f3d7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 25 Jul 2022 23:42:29 +0200 Subject: [PATCH 26/62] haskellPackages.terminfo: not a core pkg if cross compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GHC's cross build flavours disable the terminfo package, so it will never be included if we are cross-compiling – setting it to null thus breaks all builds depending on the package. To fix this problem, we use the versioned attribute generated by hackage2nix, just like we do for xhtml. Closes #182785. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-head.nix | 3 ++- pkgs/top-level/release-haskell.nix | 2 ++ 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 48972849cf6a..fb976a7b331a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -38,7 +38,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 11c3677913ea..48c63f8b723f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -37,7 +37,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index a6fad258cf85..8174307b7e6c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -37,7 +37,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 127f3225c297..a5914433a448 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -39,7 +39,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index caef6641164a..53e604fbff30 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -39,7 +39,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index ad3aea047ae3..a2546c3dc5f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -47,7 +47,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 17ec8528e408..6ab31c747477 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -326,6 +326,7 @@ let random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; @@ -337,6 +338,7 @@ let random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; From fbda5b9059b4832624a607a64163f0973eff2527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 25 Jul 2022 19:25:04 -0400 Subject: [PATCH 27/62] xcfun: enable on darwin --- pkgs/development/libraries/science/chemistry/xcfun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix index 0856168092cb..0534c7b46b03 100644 --- a/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ b/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/dftlibs/xcfun"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; } From fefa4ba247767727d6992f400466c2904d1ef467 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 28/62] python310Packages.soundcloud-v2: init at 1.3.1 --- .../python-modules/soundcloud-v2/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/soundcloud-v2/default.nix diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix new file mode 100644 index 000000000000..ca21c4cebb8e --- /dev/null +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dacite +, python-dateutil +, requests +}: + +buildPythonPackage rec { + pname = "soundcloud-v2"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9a9c12aa22e71566e2ca6015267cabc1856afd79fa458f0fc43c44872c184741"; + }; + + propagatedBuildInputs = [ + dacite + python-dateutil + requests + ]; + + # tests require network + doCheck = false; + + pythonImportsCheck = [ "soundcloud" ]; + + meta = with lib; { + description = "Python wrapper for the v2 SoundCloud API"; + homepage = "https://github.com/7x11x13/soundcloud.py"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 468f80eaba13..69627c56b40a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9986,6 +9986,8 @@ in { sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + soundcloud-v2 = callPackage ../development/python-modules/soundcloud-v2 { }; + sounddevice = callPackage ../development/python-modules/sounddevice { }; soundfile = callPackage ../development/python-modules/soundfile { }; From 6e6a515607b19eb575ba99d7b002b7d4683a5f8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 29/62] postgresqlPackages.timescaledb: 2.7.0 -> 2.7.2 https://github.com/timescale/timescaledb/releases/tag/2.7.1 https://github.com/timescale/timescaledb/releases/tag/2.7.2 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 219efeea1340..384d8140af93 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.7.0"; + version = "2.7.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-h9mDa4dfr7ksIqd6OZg6L3jyiwPL+fmJJzoXFZH8mqM="; + sha256 = "sha256-roM4a+WWn8aODkS/kvouM6rO4TnVR7hAZmCkJkLpHKQ="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From 27a02db5844efce87a03b26fa7f9abd9461a18b4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 30/62] scdl: init at 2.7.2 --- pkgs/tools/misc/scdl/default.nix | 33 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/scdl/default.nix diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/tools/misc/scdl/default.nix new file mode 100644 index 000000000000..5f9cb2e3afb3 --- /dev/null +++ b/pkgs/tools/misc/scdl/default.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "scdl"; + version = "2.7.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "7d6212591a5bccf017424f732535475fb9ae3bab26a4fb5bc36064962d33f8e0"; + }; + + propagatedBuildInputs = with python3Packages; [ + docopt + mutagen + termcolor + requests + clint + pathvalidate + soundcloud-v2 + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ "scdl" ]; + + meta = with lib; { + description = "Download Music from Souncloud"; + homepage = "https://github.com/flyingrub/scdl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7820cc6b4d0e..7a4c7d63f4bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10441,6 +10441,8 @@ with pkgs; scanbd = callPackage ../tools/graphics/scanbd { }; + scdl = callPackage ../tools/misc/scdl { }; + scdoc = callPackage ../tools/typesetting/scdoc { }; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; From b3dfa02d0016c351d4bd262e4652892a01b094bf Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 30 May 2022 14:20:41 +0200 Subject: [PATCH 31/62] wlopm: init at 0.1.0 --- pkgs/tools/wayland/wlopm/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/wayland/wlopm/default.nix diff --git a/pkgs/tools/wayland/wlopm/default.nix b/pkgs/tools/wayland/wlopm/default.nix new file mode 100644 index 000000000000..5e08e5b53a83 --- /dev/null +++ b/pkgs/tools/wayland/wlopm/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromSourcehut, wayland, wayland-scanner }: + +stdenv.mkDerivation rec { + pname = "wlopm"; + version = "0.1.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = "wlopm"; + rev = "v${version}"; + sha256 = "sha256-kcUJVB5jP2qZ1YgJDEBsyn5AgwhRxQmzOrk0gKj1MeM="; + }; + + strictDeps = true; + nativeBuildInputs = [ wayland-scanner ]; + buildInputs = [ wayland ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Simple client implementing zwlr-output-power-management-v1"; + homepage = "https://git.sr.ht/~leon_plickat/wlopm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ arjan-s ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df7aaa7ff1fb..51303d1fce18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3329,6 +3329,8 @@ with pkgs; wlogout = callPackage ../tools/wayland/wlogout { }; + wlopm = callPackage ../tools/wayland/wlopm { }; + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; wlrctl = callPackage ../tools/wayland/wlrctl { }; From f5c80b0c0f432a87245c1d3375de2d1300bd11c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:01:10 +0200 Subject: [PATCH 32/62] python310Packages.dominate: switch to pytestCheckHook - add pythonImportsCheck - specify license - update description --- .../python-modules/dominate/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 61662c596fd4..aa840dc9ff51 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "dominate"; version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; + hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dominate" + ]; meta = with lib; { + description = "Library for creating and manipulating HTML documents using an elegant DOM API"; homepage = "https://github.com/Knio/dominate/"; - description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; }; } From ba47e418e5729caa3eb73cd66c887179d962ed3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:44:37 +0200 Subject: [PATCH 33/62] python310Packages.pick: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/pick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix index 6af86d37af93..c173e1480459 100644 --- a/pkgs/development/python-modules/pick/default.nix +++ b/pkgs/development/python-modules/pick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pick"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "wong2"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-McxgXg+nTQzCjTgKIC8VmlNIfTTMwDo+dGAGwocpIlM="; + sha256 = "sha256-y4wlYYDyhwnRjz9ItiDi2iCa/0F2RTB6Rstl8lmQ/3w="; }; nativeBuildInputs = [ From e4ab3833a4579198d6adde686500b838bd900391 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Jul 2022 09:46:02 +0200 Subject: [PATCH 34/62] python310Packages.faraday-plugins: 1.6.7 -> 1.6.8 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index d76c2ef2f12e..b70e239b4e94 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.6.7"; + version = "1.6.8"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sLY10lm9buhE2iJ81R5cItgVmnJA016Su+QEbW1/5DE="; + sha256 = "sha256-nRt2rcP/UldnNzDxANQDCzuqkFCU4LQxfWarqyc5a5Y="; }; propagatedBuildInputs = [ From 7d84ef8ad9d248bf4dae17dcb35423fef3e2309f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Jul 2022 10:56:03 +0200 Subject: [PATCH 35/62] thunderbird: 102.0.2 -> 102.0.3 https://www.thunderbird.net/en-US/thunderbird/102.0.3/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index be24852735f2..a96396c9f6c7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.0.2"; + version = "102.0.3"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "c757543aff8b0acc48f1e2d5fb94024fa894a34f27275eb9c9193d8d2c6aee7643d8b762e7b511c2217130a93ffb0d5e7a405b2bfb15ea129b2a6f9ae9c7e9f2"; + sha512 = "ac9f22935ef558890c95cf7fbbbe32a5bb1b7140acb10088ed0d037d1ca5c6e11695c131eb40844807003b77e83b1dd2d9008df420ec394fed5008d5c4c6c3cb"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From f05adf5fafa4a794947be298337c18e6944e686f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Jul 2022 10:57:32 +0200 Subject: [PATCH 36/62] thunderbird-bin: 102.0.2 -> 102.0.3 https://www.thunderbird.net/en-US/thunderbird/102.0.3/releasenotes/ --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index d60f472a5c50..c0bc4f5dbbee 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.0.2"; + version = "102.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/af/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/af/thunderbird-102.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bf31f2fd59685a3cdefabc8512fe57603392183ec653f369adf750d37332da0d"; + sha256 = "acbb0b0467c0f83179c301e6435d6fb09d784d793bf56eb9d10a2240f40972cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ar/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ar/thunderbird-102.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f1b456ee95540ab8965647d9bd795a1411701a95f3a5d09fb8694eb27b66b58e"; + sha256 = "c15a7753c36d20da261a4819a49429196d839a7288b756478330bcf69cd93611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ast/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ast/thunderbird-102.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "79ad9345d0a2d0545a1ba18f0c0d97372065a53da58c258c8cb58a5881308349"; + sha256 = "2e0747bfa96640d8c4998d08b3e1096797d870773bc805a2d9726da110799e35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/be/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/be/thunderbird-102.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "77e43b688c0888959f07f57e9bf46d74b84387483aef3d0b6153249850b33a6f"; + sha256 = "1316efa7b999c1ecd6470520ae90beec9575e549bd1735ea523bb61b1edc3230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/bg/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/bg/thunderbird-102.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e02fe0e198cc340b9dd63af7a064fc3f6ff0301eac8b11546f30e44abe482959"; + sha256 = "502f8aef0eab71e3b07404e888962930d3fd751d4402c178ed4ab2b38b1f9fb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/br/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/br/thunderbird-102.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f4fb54301e34c77be5503808a183303ec702dcc004a9e2781acc786ba53a6f46"; + sha256 = "1d3ec6f206083eca2b72f65bf50134163f58e800607e768892765f040feea94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ca/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ca/thunderbird-102.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e0da55902658afa56cd28ba704a0d266f65fc92fc4c8029d52f43b5414b1a2e9"; + sha256 = "aaae5de848334d5ebc3f761ec6780aa9826e43424308c256d40469c63699b6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cak/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cak/thunderbird-102.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f82182d598a8de79a634713bf4390a6134f225ed693f3edf88a69caa939e2f8b"; + sha256 = "f391f7d47c1fd9cb5ad7f5e1d79e20400521449404842cedaa7e5ac613e71e10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cs/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cs/thunderbird-102.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "262c93857029d9a8376fb2846e0d93ff9b42de13d18a15d6c2cd3a07cecea6af"; + sha256 = "9ba13380b2ac7c54f15e294fdd1534eb6687056865dad5f72aa4c7120fb2740b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cy/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cy/thunderbird-102.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "084ac1957a02e8a91773fa327861ca23191429fbdb237f9ee727e518edacea48"; + sha256 = "3f93b8fbe6cb9928a546768fbf0976b69361fd1ca34acc207b74a267cab32b7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/da/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/da/thunderbird-102.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d9e8f431470511c45932d0d498a26492b1829a4f8004f573dc0b7b8397adfa24"; + sha256 = "45a5500cad37d4a50ae16801362a1b32f4233f9febd2400deb239e082fd59421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/de/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/de/thunderbird-102.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2cc8cb967f90284fd2c1fc7bed97eda6aa045316732582ab9c8a1ec9839e212d"; + sha256 = "4b36a09e6945c0a4674982e726ceaccf7b7724d9f394640f190ab0b2597cff4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/dsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/dsb/thunderbird-102.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "734fbccd006fa3158bb982897fd99b57143ed3b3fa55786b71b6e8a53e56ee3f"; + sha256 = "3ab10a155916f89c803738fcac21a66b670321795b2aed813d3007e34f00b996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/el/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/el/thunderbird-102.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "62e36b4f5152691489d8992b7a51773e90b73da553dbb125adb65f271f5f6d0f"; + sha256 = "2bcdedd483a0724714e20416fe4ff57d5f8d7e07da32e54430ab1af20a6f6089"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-CA/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-CA/thunderbird-102.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "523a1f718c29ab241d94e3f780ca3c5825d9db5c9a8d5a7e4920f004566cf4d9"; + sha256 = "0b5bc27fd53c7b19a81d0dd502866237e0861770cc8e7caba5b5771b5321cdf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-GB/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-GB/thunderbird-102.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8503130f0f43250cc365e99a672ce02e15b78c40aa20d4585d0b048bc43695ae"; + sha256 = "4bd0315b1b1f8d9d83e91b845df10807274c3ee921551fdece8a25cf51db08f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-US/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-US/thunderbird-102.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a98f9cb5d33e3225e9e152b3f47c7046c8a16e43aa43a7e2534ecef12e8f902d"; + sha256 = "16c2db5a24db5f9a7b449a73ebe0b881fd6965c4060f9b005df2ec819dded4e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-AR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-AR/thunderbird-102.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9ea04912f380917a8f721f29a2a3a8ecc4eca436f838bc70f8fd138189450a1c"; + sha256 = "a9cb0bbc9ea7cfe759cf19e9e27cf23ca88967d26e7a951a5b58908fdd535cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-ES/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-ES/thunderbird-102.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "bf902ecef24010f1ac7c88a5906ec78ef1b7697e06ad08c327bd17a08e6fa7e4"; + sha256 = "462ebc50ec7fb4a4f6fe81fcec48d2e50ae6ae0c90768499104692fdd5e78396"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-MX/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-MX/thunderbird-102.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b25bcc0f5a030e3f1a0f999b9d7680cff0ca2ff250eb4e193415d732b6ea548b"; + sha256 = "bb025a6d3bda7916ecba63b400386fa046d0a075ad1f82213d7b6577d6605edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/et/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/et/thunderbird-102.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "602f002ffe740b2ba7b7e2474628cbaaa053fa3305a20ea5469d126fa81156a0"; + sha256 = "7914cf39516159f769f29ca73985ae45d587c8db953fea10aa9814d65bbc341d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/eu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/eu/thunderbird-102.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ecb63e896bc9c07b3f0367fda6045ace405616221fc6072261a981fb65276194"; + sha256 = "b34813f880a4a48152695a65d5ff24e206e34bdbdaeb8edef59c0075d3b130de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fi/thunderbird-102.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "753752f6da47d9f486cb61a60a8eeb8bbd8ecf18d7bc37035dab4869e3d5255a"; + sha256 = "33aff0a00102765d0e102eea520f615a3d4d0f1d93a00e8768e6fc93492fd16e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fr/thunderbird-102.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "982175567ff4dfb950e198d810b1bdf2d557b053c0cf2a0ac7637bc932e34c39"; + sha256 = "0cce5a940d8c3a2b9d15d3102108d21c3165d69c30a62618da0a93b95a52cf99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fy-NL/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fy-NL/thunderbird-102.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "fc37a298eac00ee1b137520b130397688af0870f390fd373e2cb2afc24626b22"; + sha256 = "bba6ccedface111987459a370352972853fd0af65a61a1a0032faf24113730df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ga-IE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ga-IE/thunderbird-102.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7c86dd97d76481025ae72333c50b89cf3abeec18bfcadc916d33498e28bbdf48"; + sha256 = "18960a121ffc43f27e9fa733ec2a80881f4ca9316bf6114ccc693de772416c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gd/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/gd/thunderbird-102.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0bff5a9c420df5fe9d14b74d3013ab53b18d61cb7de4d8f054d8bb05d8e1110f"; + sha256 = "6e4430667839fbab52acc968036d9a08d99eec0eed5ceb5284ac747c4026c5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/gl/thunderbird-102.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4749c8f5eeed740fe2c01afedb2e528ecfb9820c8856cae652803555a30845c9"; + sha256 = "0c871f1f195fc35b78c9f6b1f93220635231f117da3c5b470b852724408390e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/he/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/he/thunderbird-102.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "52fab3f4ee2f74be4792bd233020ad514ecda12286bed194eb985a3ce479621e"; + sha256 = "e0f6dc98cebe0a00361b05292547d338d767837b5a29740786049f0af9bdbf38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hr/thunderbird-102.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b1881e7ed5e6f55fc744589a766480908f867c5fcef3c2aa2e723c5c3b2ab44"; + sha256 = "af6a7cd558d9ce3f30c98fc1f6d4d5ffab8342dbab27b381943f8d21aab05f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hsb/thunderbird-102.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3e76a53cdf1854e08115c7bbf488f94a14f5965088a73df6b1d4aff6423aecd4"; + sha256 = "fc121b9b7ff2a74562dd239345d8754b3f21d5ea99eea47eee2436c71aad39fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hu/thunderbird-102.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8935b6a67f6f1d849eb007c6145909db1d6f5c1ec44ccf0e03c943ea5fff8d23"; + sha256 = "e8df28798a07a4a43265f5a8c29ae0844f083f51bffe54afc9b173881407021b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hy-AM/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hy-AM/thunderbird-102.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8142f0068ec9636a2269df7f732e99e080d42b9e65922968fe4e631f0eae3062"; + sha256 = "8a7c705633a98937550b8c22199dfba8f9908fd6ea2c41cccf504bcb8c1b0c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/id/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/id/thunderbird-102.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c798aaf2548942168671fcb64487fce251d1daf54b7fe4ebd1a868028acb9018"; + sha256 = "ed2d44255fc8d227a602743619b6bab606bbc17de96f90503c644347fa99cc58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/is/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/is/thunderbird-102.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9740e7ea80d038821a00da541813e8fef924a40c7a90e2cdedf42ca075b953ff"; + sha256 = "309d47fece404ef7717d95cf0b4920be48ecee0b69c73a1431e7044fab5c46d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/it/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/it/thunderbird-102.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3d5e4c0bd729894db0e3b8ce0eb01c07b68cd1e3480c8b906345ca8a28a24fd7"; + sha256 = "e92bd95955e9e6964394d95dd6564956e14c618e73f9853a72473cc89f6e68b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ja/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ja/thunderbird-102.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fde66a7b89e8581545fb80f549c262c3248562e29bd9a639344469ecca8a0720"; + sha256 = "81299c0ccaf3dd52d92a081a828d01573bcfe7f821c7cb6d0697acb505591189"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ka/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ka/thunderbird-102.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2ebc499ba3084fb9d544fed31037a9d0e92587e40680855fd6051842c2968e6d"; + sha256 = "8445a72ae12af5c11d56e0dc1d8bc3beb5c368386950b3815bc63c6b3ff48837"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kab/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/kab/thunderbird-102.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "101a29d4a11e06eb07c2e9e2912eb92940787692714d52512438488fd47b33d3"; + sha256 = "c403ad18c89ba13550484a4cf83afd0e28c6a11dead70f4a40ad81e136b5c4a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/kk/thunderbird-102.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9988f45d389abbd5f5d60fadb4aa629a761d87177688a2012ac530150f830c7d"; + sha256 = "924ddb7c862291732f58dd3e57b9a3b30e39eea24efc1a02a6226f580c6878ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ko/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ko/thunderbird-102.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f2af42b4ca5a75dd96bcaad3365ace3888d58b0051a1e6f7fe5d028ad9906635"; + sha256 = "7663f31cc759cf0115a75bba540f57f6c64905c63d204825a5fc63ad6e274edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lt/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/lt/thunderbird-102.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "978f9f7890d4dc8551589fab115107e2f33d8ec7825806a986436cfbfc75da6e"; + sha256 = "039d08152f607f6a8190cdb306e37ec2434447c655e9a86a5703170a36116a4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lv/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/lv/thunderbird-102.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "81b1ba931b5ab3973779a157d3ed7cbe647e4a2d1c1e3a68a11594e7b4d3b4da"; + sha256 = "0f40dbd570823d52abf7739024f1dda2a52303b02edf63939b6a544f15231252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ms/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ms/thunderbird-102.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f0e5dc7e5427674b471df56619380efe6ea72fb50f826d0baff04a66f64f44ab"; + sha256 = "6f8abab920d8755f94bbbaa151fa6400be664b7e6dedc57e7c94c0bb2dfc4752"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nb-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nb-NO/thunderbird-102.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "449f60fc5c127413acd74a4d2575763745440b973249e5ae624379d259e41baf"; + sha256 = "4938fe75b54544ff7888c6db0a52b94ab4d71af15cfe429d6420ace100f47f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nl/thunderbird-102.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fafe5a13869c3076be69c8d0fb94d3044c4774663e12fb75bab2f68f63c47455"; + sha256 = "769484d34082d656720e92f737bc7b80c39685e74aefa3148e8988d54c3fb96e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nn-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nn-NO/thunderbird-102.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "275b2e1bee94a1ef3adb97b4d1ca520c4f27696cb71b81bc80d9be354293bcad"; + sha256 = "2f6628897a9dda07bbf8f0d5df020b073b081ebb5d77942f23a38900b56f0cc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pa-IN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pa-IN/thunderbird-102.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "37a7d35f52c1b805334a1320cfaa04182b6c1428f77e8722478aba4d5303d4ce"; + sha256 = "d5381e984b7f180c743f1572ee156c9b23350eacf3cea6b005aa159022bcb5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pl/thunderbird-102.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b0331dab8d0d2a09d95d5e87c948b10a47af47f47fb59dd11356693b85e3b2fd"; + sha256 = "2322ce9c3979e01d3bad6af964b1917293a654fa24e1ae70413194e93ebc4016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-BR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pt-BR/thunderbird-102.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8309588bba6f3858987e5c0d6ec083f3cd5195d49d5f9cc216b61ab972abc652"; + sha256 = "c427e30ce35ae73c9f214aaccbd61880dc896f18619d85e81f166d068d01a107"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-PT/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pt-PT/thunderbird-102.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ebbc0276bf25a2ce9561ad9e40d286448ba57cb9441bd57cd1114cd1226075e7"; + sha256 = "8593bd34d6c87882d38cb521bd7e64e698565376bc50198a840f48516d2d1473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/rm/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/rm/thunderbird-102.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a97e6c804bef1a28e80920d528865dc41851d75cb4415fde9a4610d6fcacdfaa"; + sha256 = "8afd7611f7a3604fd1b720ca4fd8f91b46e43a905874d87ef1befaefcfb73c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ro/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ro/thunderbird-102.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9dee91ec00405b58f730b7a9a23a59f1dc0e4506cfbaf4135134f13b5029ff29"; + sha256 = "322faa61dc5524d84fadbd57df1cf6a12631c12b02af79807f6c0042c2d7906a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ru/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ru/thunderbird-102.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4558b9eef1db93aa4e8602530809be81bc62317872b344bc6679c7da5ec0def3"; + sha256 = "696b98e0a1309bb66355051a0dd507a323e16fd98425fe8fff9688625edd6669"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sk/thunderbird-102.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e2ef80bb2c1b98b78380c7ade61f1272dde33b9b57a155841a37fc5cd360a9a4"; + sha256 = "4370208682ced071070f798a5f3f024a6a154e12150435550ddb96334dd773de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sl/thunderbird-102.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "20cfe9c9999eefcb77b20c5227ab9001e3682770bef73ba8f994b714d99b83e8"; + sha256 = "c7b15cbd62fcc90503f16ca6cfccded4205cd2af058886f23435317b0f085425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sq/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sq/thunderbird-102.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "17d92fc90a0832711b7d39e2ae959cf0ed6b4dcb53998ce1de529d6088711963"; + sha256 = "e5827847a7d987fdc0484bdc70110213b1d3a1ee4ba8e0b10bcebfc39c9f3e5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sr/thunderbird-102.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0a9613c7265cebc62198dbb369b790748c5b8c47c0d0112ac03abc4e599ee2f5"; + sha256 = "a17962cbf4cc6b302a7b06432fa9a5ba11e33505089619bb677293d6f3529832"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sv-SE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sv-SE/thunderbird-102.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "64347005f48bf84851a7834175f82071a98a3a850ed832f3d42c298a7ca1a366"; + sha256 = "bb11f3928321898f0c746dc988995bf853e102f753b91c602073c8357cfb1d00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/th/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/th/thunderbird-102.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5ae8c2c1c6a82110b60402d3868e74a8606ea44acf3d1fc370673bb0e280da04"; + sha256 = "38696729272f4ca48d918767135e03a24226f86529d243482c729196d645f94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/tr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/tr/thunderbird-102.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "05023d2d511261c0237f65ab1e28981d5ae8c4e493a225f74c121186d3b43848"; + sha256 = "3857970887245300da2d764a2da99a64fcdd725ae9456dbe423a79483666cd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/uk/thunderbird-102.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f5a6805d7a2f2b33e6c9357598a55032e288c70c838bfb7b3cd66020475bdbfb"; + sha256 = "743b5f2b7e04af087acbf75ca47ea5ec9588530908a33c8e2025d1ee6d91b70e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uz/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/uz/thunderbird-102.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e5f656f5a367879bb699f2676ba51b3e8bed10d3ec756ab95c2406b745490fa8"; + sha256 = "ab498aa09a784ca8f42ecae1cfb7ed6b54afbf7381fc3f32391cf160983fdbc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/vi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/vi/thunderbird-102.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e7aff2fc6dc436f99f32a5762562ac66961ea51f4e7d012f44ffa8cb8e820c8b"; + sha256 = "57d18f28b4ebe93093657aab133c58da1859ad8261fe5eb14f156a813c9feb53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-CN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/zh-CN/thunderbird-102.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "658a6ce621e30cfe63071320c3eb376731a58a138a4372bf0908f83457511752"; + sha256 = "7922f00281084e18f3a27f661c14730de81b7df0ed3052374ad6ee1f93d15ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-TW/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/zh-TW/thunderbird-102.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4e3989b239a7f574e73f407282d1b62d6d3fa828c489dc454d80db1a58dc4575"; + sha256 = "c8119e17541bd649728d3fa4f725231ded11f37809048c5b20e8847b8c222ec5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/af/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/af/thunderbird-102.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5252c4a31ca1676208a4ee0b8172945a2a55285da5d397168e39afd8b744cfd3"; + sha256 = "dd728dbb96d781c4ad0b2a01d67807d2b8235c7b77f652b4d226248f84f2bb92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ar/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ar/thunderbird-102.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4b1dff9eaf981a6a52c9dbb7c6eff636b2a675e937e04564edbfea99fab4b636"; + sha256 = "68314d9ce2afc0a91578b7761df736b16d3016629ac191474a014e662bf4e419"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ast/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ast/thunderbird-102.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "722f72b3f018d60161f82b6709bcb866c483b5c77501ae20ff617ed088c957c8"; + sha256 = "e9e82165023f075e6380794487474856ef0420530f94f8c1c233d3112fcc2ca5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/be/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/be/thunderbird-102.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd85fdcdc39c68e01f2daf08db11f309e139f3c0298ce1956a0ee70e9a205ffa"; + sha256 = "3722fc4b2a9f42104f4bb2267923320c392f817486c1dcfbe4a92c01764a900c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/bg/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/bg/thunderbird-102.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bf937297e3144adfd5a6b995965057be524eb85363a0402972139845ecf82f44"; + sha256 = "719f8571d79cdef43abba3bd2e453d875652b9bde7b24ed987cbb83b313e8cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/br/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/br/thunderbird-102.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "206b8c6a0aa5f1f3ccefc5bc7de65fd7ef457d5e9093f1613e7d1021a5845e05"; + sha256 = "8195d158a2770707073ae0ed18bcf578ff061c052d593b4feb02e9f10facb6be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ca/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ca/thunderbird-102.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "72247980162026fc55057ad1e235dcfcea859386ce04cbc7afd0f2e7276fa533"; + sha256 = "f97b5247b38c00f2e6db3a2edd878de0059dec8a59b92663ea2d9f7175a4eb7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cak/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cak/thunderbird-102.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f19bd02105be26da636c7e2518f39b2c566594ea07dcc6c742e10ede9834e82f"; + sha256 = "247f1be0ebac1033b519dadefb35c645c02c6352658a24e9b2864d449bc91ab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cs/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cs/thunderbird-102.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8edc31d5b132274a12077939cc45dc805498b3a3ef798bb8038ab3921597adda"; + sha256 = "39bec8757b777aeadf5e3803a1b8ca52bf8c62f906d792b1d47a68b67593162f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cy/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cy/thunderbird-102.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6497e711b5e4a9cf97307bdccd462f778527a45f1d1ced675f2452d549da0b7c"; + sha256 = "d9899c8f3b6c538828b559af3990d44bb93fa085539815f4c800bcd3f7f2029c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/da/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/da/thunderbird-102.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8795c5eebfd9fbe26b46556cbe7f606b2a73dc1071f4987b71ceb97e6c30fe9d"; + sha256 = "359ffd538a7f5f2870d8bd379f1538800defe296766a0cae57432e545f0ee49e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/de/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/de/thunderbird-102.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b805d8339a9e8082c6497adf2afc2a649bb036562f732e8e15f472ff7f84d6a5"; + sha256 = "1f372cd57db1e564d960c12dd34317747017d4255e2c5dc8f960d5075bf2a835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/dsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/dsb/thunderbird-102.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c1d7038e6b6dd30fcb71d5bbcc46332915e959c79e3772f66b920747f903c497"; + sha256 = "fca6872c8bc3fd832ceb96b4cabe189fb4b679592fbf4fd4e27df514da917d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/el/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/el/thunderbird-102.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e22bfbc3624474bc187551d16f390186b131c7552ff492a39c044ec4aa1d3ff8"; + sha256 = "81ba36edd7ce98f44a86511fc7b03e030e2fc2ec1821640114a6546babc1b042"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-CA/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-CA/thunderbird-102.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "955d58c13452c7937d40f643c4ae27595e32fdde947e326036519695bf529e19"; + sha256 = "bf3ec87dd0842e92d0a759e8bad1eb5fbce8917277fabfd70b8366bfab9f011f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-GB/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-GB/thunderbird-102.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1667598685761e043dfe6966b7e26e76a0de391e64c807610898f5d12c3426e9"; + sha256 = "9b1ac42adceab6ddc19bc432ae4568fe4008f0063c59b86871041a299890d9fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-US/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-US/thunderbird-102.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "156f92a9e0e45fa42f2c3b938d921c66b25ccb123505e2ca469d1107138a1c99"; + sha256 = "acd7b35b5d7d2e863a0a37a850b60d6ce91d156476ce1c7974256339000d86bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-AR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-AR/thunderbird-102.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b5ba861b6e6aea74b9fffdcfef921f4c66e0680a57e1c13a2fd2d4cb068c62c7"; + sha256 = "4b2715d15add631a1158e843108cbcc0eefce833ec42d7d35b4d856b473cb48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-ES/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-ES/thunderbird-102.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "614a0738702412054c9c42e0b78796230030558b9819f164e80cb66a210f41d6"; + sha256 = "6b3dcd54b1e948ee36a3e674c22e56356b66503bd40e149b9a24ea3116cf98e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-MX/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-MX/thunderbird-102.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "239387c3450a99bda49eb044d15e2adbb2765794ae5219d4318d88afaef66410"; + sha256 = "49fedc894cd933770536eea6359c31a01e47ad9e797274284bfaf3ea8de8ff15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/et/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/et/thunderbird-102.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fdc1f424c43c9f7efc9e760d7f2dfdb7a5ead58bf26a0d5669b539ba04e6db0c"; + sha256 = "78d961730172ae310bc08139d0eff9471745900d85fd8a568c97d649bca1b354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/eu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/eu/thunderbird-102.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e229f46845b2f192623b88a8103d704d3fe271070e187c5796b0cf309afcea04"; + sha256 = "d8dbc084f38f86598cb1efe16a6c48634c57830318d9a9d1f5ac9ef7c63ef7ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fi/thunderbird-102.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cc31a8a0235674ab72c00de931659167805741e71f1d2e3553bd30de457c8d33"; + sha256 = "71d303185d5ec95d607507bb9836a01940908e27c15117575280b13dcb5788c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fr/thunderbird-102.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0bade93a0a2b8bbd342baaddbda0ed9418a0ec9ff3dd5db54f688279d0a778b9"; + sha256 = "55e158f1204517652d03e2b7d1600cee41f8c024db794f4676826f960440a6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fy-NL/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fy-NL/thunderbird-102.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "476a21ca877b15a6bc619686ca3884f02017b295e25675f09a0cfc2f0ad21900"; + sha256 = "329d42fef604eba4f3b5d036ba5b9acf055673205dd30f8651c94f5c7684bbf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ga-IE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ga-IE/thunderbird-102.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "da21aaf27c50ccc17558006e5e955578e5d9319ad2aef6eb70dc64fff63594db"; + sha256 = "4c4d3de0d9db04caf2b46238c47c6b897f2d7fe52fe21cfa14d71568671dbf02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gd/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/gd/thunderbird-102.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6ad7f63a5d0f9509caa82249c310fe1d4e178460ecc1fba1c465626a1711ea4f"; + sha256 = "f14761057f6d1d6934e5e1cc55335a46f26a2382dc4708632665265331b4f08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/gl/thunderbird-102.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "516d2579a2801d20e956b2c80d576ebeae9251896256875e52a722d42014c55d"; + sha256 = "2078e7499593799d76b2242f44c0097d5a1ec357da62802d5d1cce47732a75a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/he/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/he/thunderbird-102.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f30ca9bffe64f7f72980031a424e33db5ab0b7665e53e2db96862316b5d04f15"; + sha256 = "2fa1c357cfb849d61562bca9146939eda36f0af909022dbd21029b3c47f683ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hr/thunderbird-102.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "62bf938f8f185de8d5d485c229142c71a1fd533ebcb4fc1cbf49d541ab70f7c7"; + sha256 = "c1b8fd464affaa87903856b9c959a09b120814d6887ce946db14e1f429a85304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hsb/thunderbird-102.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "07bb48f656bfb77142c3a509b4470d4c022dff3f6378ef6c01f858c8aa9c0d0b"; + sha256 = "db8ac9b2463293d8360cb04df2a5a7c92f4b8eee7f1e705ca3b2f19031ff2d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hu/thunderbird-102.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8ab53272bb1f9992ffc5dddf67099b0b966991549a07d8275e6f6999c1b881a3"; + sha256 = "3749911e71ef81a89a3009bf691c8a06abbc1ca537dedb68c785dca9f0257d4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hy-AM/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hy-AM/thunderbird-102.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "53459949bda746c5a2e02a9919efa730c6dae96ed818f3cca2c4f4bfcbee4c09"; + sha256 = "07988301e82d78494e478fd5f99a0639642364bf53f8cd9711ff643112cf25c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/id/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/id/thunderbird-102.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "705d28efb1bd9ab1516d00d44c7e60f3c3345ba4249cca5913c647d87075385b"; + sha256 = "8af0ece3ba77f12ed9053ff9bcf311cebcf8159b34bded5df09748c2fbfb208a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/is/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/is/thunderbird-102.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "27d56900ab0eee73aafb9d4a2a5650e2535872d4d202bcad6ef7003b4ea6c7fb"; + sha256 = "663b1af1fb3977edcb5524769effd6a94da93860c9c7206c4b31aadb85e5c8bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/it/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/it/thunderbird-102.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "84649aaebabf5bf67121b1a36f9bc6fe3609ca4995e53512fb109848f8007721"; + sha256 = "83739d727628ef7b60c5732d41bb6c708d3adfa5fb2ccfbb0f1a62f4ac0317c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ja/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ja/thunderbird-102.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a8879ac875b3ce85962099245dbe8b73fa12b50b56132f5891b0be2abb61c06f"; + sha256 = "79d20840657d20afbe7d1dcf5e86d26ded6e72a52d41b4433dbd7c08e77a239b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ka/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ka/thunderbird-102.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9d9c229c15a370d2efb3819587424c89573a66fe2be49622791ccfab40ef3c6c"; + sha256 = "86b332459621f593e9f311b1b606e38923ad8862b4d0b6a35e113cda67ad4255"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kab/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/kab/thunderbird-102.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5c972699c55e5290784a902c58655edfed6e30d6423a7f52b1fcb0e26e416507"; + sha256 = "9e4def077f06509440bc78d7ac2b7573c0e2140944bb0761d55472cb1a5465c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/kk/thunderbird-102.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "be446aaebe589f3d5274635102f06b9dd2aaf4ff34b7dc0a332700b520b623c0"; + sha256 = "39bc019264f03f7f8a25bb42242629af3c7971965b7a448f02f862e76087b7c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ko/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ko/thunderbird-102.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "452731102d29b927e442b2b0ec5c4a82a7a354933d255ef43619f11f9e03e334"; + sha256 = "183bb61c5e4ab7ee00b5da58bee26557e82c9a9ced39e276c8a5b3f5f7974c42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lt/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/lt/thunderbird-102.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "eb12af786067c1a8bc43aee746a1d1b300fc0bab998af7352abae2d0bd4b61fc"; + sha256 = "da9177b28632516fecdfdb0561a9af8c502872f1f79ed552d3c7f948597ff55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lv/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/lv/thunderbird-102.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7277d68a04e10ca043d8563d1949f26da622a2952004664562c85a7943f4fed6"; + sha256 = "5a808bff2a272396c43ecb2353dde36a1ef7f2b6c871f00e94f20f787e0ff84b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ms/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ms/thunderbird-102.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d923e39e46b3678427554e265d62b085683d074960b5e25bea720cfa8e9bde95"; + sha256 = "e6b6ab180f723936c8a8a870359ffec20347d9fc58eb1b6406b76c7fa292ca1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nb-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nb-NO/thunderbird-102.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ece7236c20992b5dc7f525fc6390f6fff38d2798255dd8aa692cef9a9bcb3ba"; + sha256 = "bf21182e27be5dd930b2cb2dcd31ed0c1c4c14b0c09a34e1be7f62b6aef85800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nl/thunderbird-102.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "48a7a11e49f22424e79f3eab5c6961f2f3ec81e2b5ecf4578740214306974841"; + sha256 = "431ac204db5cce7c76e5221df0754dbbca2c4eaaf131b7a144b2e325f2df8e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nn-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nn-NO/thunderbird-102.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "099097ab9d94fc49a91a14f7f15a886770de282db4db4334f6c7b8931384e6ba"; + sha256 = "52b6f7f08ee856f631376e78ecb0ab52ac3b88faee03f4604459b5ac8a98e18b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pa-IN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pa-IN/thunderbird-102.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "83d409241a8dafa600759f0ef0f66bef38fcf4ef0ac0a7d7bdf9f0a85f5873c6"; + sha256 = "b1e5cbd3ac22af04a17920831d79c953311a9e1163cc4ca6e8aecaca89411152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pl/thunderbird-102.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cbd7e676ad0848a69f387b496346b1c3664d62cec195dc897b5e5b7a940329e6"; + sha256 = "0a15a79b2be773aab7e9b719ce0212168479e78ceb4771096f3fbad13ee202af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-BR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pt-BR/thunderbird-102.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ef30480b304a1b6f05fbdcabfedfe11e2e77519acc4aa3cfe7124c54df8ce95"; + sha256 = "ec994c42a39304861c0d5994826aa7baa2e5e07359fc192059a5f4a7e75232a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-PT/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pt-PT/thunderbird-102.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f870cb3a29830cb9c83007e466307a2c7f1f3606caa16679fa7b71a71eaa815f"; + sha256 = "efc3b02b4f1ad379568aab7bcda964ace0ca6b041197522ab5beaed2f349f16d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/rm/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/rm/thunderbird-102.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "10b52b1e6fdc2dc6d905f04d396e99fbc02804a0b927aefc8332349b67340ebf"; + sha256 = "68e891c973d3f1c0d3e375bda27c4b3f1d778996dcad1377601cff5a93aef613"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ro/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ro/thunderbird-102.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "26a1ef950fec4b46f81f963faae8082a79c836b76105283561be81c59fe290a9"; + sha256 = "7d60e055c73d0b121e5e772447f6eb7ec7b2858ef99f2a60d5b30a6ee593d04c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ru/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ru/thunderbird-102.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e22db3e3aa6519dd990e16d6e10c8cf003999aa83b9f50f4ba80d3c86c73dba7"; + sha256 = "8df485fdf589942e5e0110401fde31dc33af56fb0b1e0f972990cd25460651dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sk/thunderbird-102.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d7d1fe7d44c07ef15ebf3504ee66f2f5c9f9a9710d4e1f4f9e42816b26b44a4e"; + sha256 = "b699730217177e392d0e51024dd86c93bd5655702e0e7ac628c1af729480fd8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sl/thunderbird-102.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b91300228f4449ac4cf9f8013ef0872946504e1ba8aae18053d371359f7e17da"; + sha256 = "5cd62795e8c2195bff851e077ddd4ba0b6b725a562d1e4f95100f1e7cfb00d49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sq/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sq/thunderbird-102.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6198d701388f2b3eea954bd5189c1d6b8d1633fa8f66e2dc3a123ec40bffc382"; + sha256 = "2cbe949408ec382b91fc056935014f800d13b7cc4fcd19e5d5699a6252698545"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sr/thunderbird-102.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "07b0d41ee93edea4d3fca98b5d2f3c6a046b6516eeb32d4f75a16a159723077a"; + sha256 = "264ee1a41398ff754b6b3b349b2728812bb0bf651aa39e3d1661b15e7f15ed02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sv-SE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sv-SE/thunderbird-102.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0a7f891e29298536a8f221492955bc1c0ca1f617a16e073f862380d059c753aa"; + sha256 = "05393be6b938ecb9327078305910204554ef34c413f95bf8bfc0fa846fd5e8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/th/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/th/thunderbird-102.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f6faf753d9d46d3bf1c6ac2c63ed8ffa3ae82f32d5e7d38362eed05708630d5d"; + sha256 = "9282291d0668dd7ac340dec6ec15cc2f53a08fa280823072c5aa285cab741f2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/tr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/tr/thunderbird-102.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7aef5d3d2c97a5aa96060c8cce9b80ef862f1fa6a948e8f079cf3401e38f14"; + sha256 = "415759235885f38a83269100df2492b48be42095e855841d31cd1b4b0875c280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/uk/thunderbird-102.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "490703856b02172c146c2703b630b9d06586a093f88ebeddfff9a666dd713335"; + sha256 = "480923d1f68028250ca5b7170c5391fe39152c4597ed307f1e232a2f6efaf1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uz/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/uz/thunderbird-102.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f4629622b8e5d6aff9f1dac72eea73ccbac27491913e6f03464efe5c19187129"; + sha256 = "fdb1d65960820ebe14e6a8698abd11583652cd74f3f9412e2ff5c38df0a5b212"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/vi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/vi/thunderbird-102.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a6ebcf38e4f860376fbcc6811e7fe9d688960a98a581d7eba7097b6b54db1898"; + sha256 = "eb2bab16ff71881bbc6590ddd731ecbf9a1a19d5f499c9d023626da42e4ff3c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-CN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/zh-CN/thunderbird-102.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "75787fd56d89d2841f58381efc28435acc70399bdbc8589b7b0e50f8c63fa892"; + sha256 = "0047b3f174dcd19556bf1f6f1f4bfa5fc87a6cab53d7e4d111ad7f321ffec09c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-TW/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/zh-TW/thunderbird-102.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "854c1e0c700a023e3361b48d34a3048ca783ba0b3c8b4fd9e3ec1d30bbaf4e30"; + sha256 = "cdee1981e868cb8df03681051c02ecf07936d1f5dcdee1c0f30d6c4742042b64"; } ]; } From 30981035e4dcca9ab7c514e94c9a52d4f3ede995 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 26 Jul 2022 11:08:43 +0200 Subject: [PATCH 37/62] python310Packages.agate: Enable more tests --- pkgs/development/python-modules/agate-excel/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 4d970b182217..d02d71d866f7 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -15,10 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - disabledTests = [ - # See https://github.com/wireservice/agate-excel/issues/45 - "test_ambiguous_date" - ]; + pythonImportsCheck = [ "agate" ]; meta = with lib; { description = "Adds read support for excel files to agate"; From 062084413669bbb7e80294cc5384f58f772c1aa1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 26 Jul 2022 11:15:03 +0200 Subject: [PATCH 38/62] haskellPackages.regex-tdfa: Disable disfunctional tests for older ghcs --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 48972849cf6a..5a3235dce6f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -139,4 +139,7 @@ self: super: { # Not possible to build in the main GHC 9.0 package set # https://github.com/awakesecurity/spectacle/issues/49 spectacle = doDistribute (markUnbroken super.spectacle); + + # doctest-parallel dependency requires newer Cabal + regex-tdfa = dontCheck super.regex-tdfa; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index a6fad258cf85..cbe90d1b54b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,7 @@ self: super: { # Depends on OneTuple for GHC < 9.0 universe-base = addBuildDepends [ self.OneTuple ] super.universe-base; + + # doctest-parallel dependency requires newer Cabal + regex-tdfa = dontCheck super.regex-tdfa; } From 57055b681f48bdc408753b828e7d5f3ae0e99f07 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 12:51:15 +0200 Subject: [PATCH 39/62] haskellPackages.Spock-core: build with correct reroute version Spock-core 0.14.0.1 now only supports reroute >= 0.7 because it exports the new AltVar type (in an [PVP violation]). We can luckily accomodate Spock-core, since all other [reverse deps] of reroute are marked broken in nixpkgs at the moment. [PVP violation]: https://github.com/agrafix/Spock/issues/180#issuecomment-1195328647 [reverse deps]: https://packdeps.haskellers.com/reverse/reroute --- .../haskell-modules/configuration-common.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3e5834f67dcd..b762c5495635 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1406,16 +1406,11 @@ self: super: { superbuffer = dontCheck super.superbuffer; stm-containers = dontCheck super.stm-containers; - # Fails with "supports custom headers" - # Patch for GHC 9.0 support - Spock-core = dontCheck (appendPatches [ - (fetchpatch { - name = "Spock-core-GHC-9.0.patch"; - url = "https://github.com/agrafix/Spock/commit/25c75961c4aaaa2e81c9e2afd3d758f2b643f9df.patch"; - sha256 = "sha256-JlliIpVYh2CYjJF2I119ab4/1oh6uvxMbRoxlUkKiGw="; - relative = "Spock-core"; - }) - ] super.Spock-core); + # https://github.com/agrafix/Spock/issues/180 + # Ignore Stackage LTS bound so we can compile Spock-core again. All other + # reverse dependencies of reroute are marked as broken in nixpkgs, so + # upgrading reroute is probably unproblematic. + reroute = doDistribute self.reroute_0_7_0_0; # Test suite fails to compile https://github.com/agrafix/Spock/issues/177 Spock = dontCheck super.Spock; From ae78f717238970ae9bf5e4dee4bc08ee7177ed1b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 13:20:35 +0200 Subject: [PATCH 40/62] haskellPackages.{superbuffer,list-t,stm-containers}: reenable tests HTF has been fixed a while ago actually, so these test suites can be built and executed again. For stm-containers, a bounds issue persists, though. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b762c5495635..327f850c0470 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1400,11 +1400,9 @@ self: super: { # $PWD/dist/build/haskeline-examples-Test to $PATH. haskeline_0_8_2 = dontCheck super.haskeline_0_8_2; - # Tests for list-t, superbuffer, and stm-containers - # depend on HTF and it is broken, 2020-08-23 - list-t = dontCheck super.list-t; - superbuffer = dontCheck super.superbuffer; - stm-containers = dontCheck super.stm-containers; + # Too strict upper bound on HTF + # https://github.com/nikita-volkov/stm-containers/issues/29 + stm-containers = doJailbreak super.stm-containers; # https://github.com/agrafix/Spock/issues/180 # Ignore Stackage LTS bound so we can compile Spock-core again. All other From dc78025c00e887f823ebb9603ff4208a4286777a Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 26 Jul 2022 19:29:53 +0800 Subject: [PATCH 41/62] cargo-play: 0.5.0 -> 0.5.1 --- pkgs/development/tools/rust/cargo-play/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix index a4937ee412b8..441b906ab343 100644 --- a/pkgs/development/tools/rust/cargo-play/default.nix +++ b/pkgs/development/tools/rust/cargo-play/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-play"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "fanzeyi"; repo = pname; - rev = "v${version}"; - sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02"; + rev = version; + sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; - cargoSha256 = "1xkscd9ci9vlkmbsaxvavrna1xpi16xcf9ri879lw8bdh7sa3nx8"; + cargoSha256 = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; # these tests require internet access checkFlags = [ From ff7abeabe9c2b8e9ef0d47d8ef8cafc64b6d609f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 13:33:07 +0200 Subject: [PATCH 42/62] haskellPackages.hasql-dynamic-statements: downgrade to 0.3.1.1 We still ship hasql 1.5 due to stackage which is not compatible with 0.3.1.2. --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a79e09403710..fb0aacb4ef4e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -89,6 +89,8 @@ default-package-overrides: - patch < 0.0.7 - reflex < 0.8.2.1 - reflex-dom-core < 0.7.0.2 + # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage + - hasql-dynamic-statements < 0.3.1.2 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 90ae511dee2b..f8c9c7191f05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -130176,6 +130176,26 @@ self: { }) {}; "hasql-dynamic-statements" = callPackage + ({ mkDerivation, base, bytestring, containers, hasql + , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "hasql-dynamic-statements"; + version = "0.3.1.1"; + sha256 = "1bc7l6l6ss9grgphnb0sks08v0wx0aalja4rkjzp49p5m6g82rc6"; + libraryHaskellDepends = [ + base bytestring containers hasql hasql-implicits ptr + ]; + testHaskellDepends = [ + hasql QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Toolkit for constructing Hasql statements dynamically"; + license = lib.licenses.mit; + }) {}; + + "hasql-dynamic-statements_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, hasql , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase , tasty, tasty-hunit, tasty-quickcheck @@ -130193,6 +130213,7 @@ self: { ]; description = "Toolkit for constructing Hasql statements dynamically"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-explain-tests" = callPackage From 5da403cc418250ae45b42eb226e5fff58e9270fb Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 26 Jul 2022 14:02:25 +0200 Subject: [PATCH 43/62] python310Packages.boltons: 20.2.1 -> 21.0.0 --- pkgs/development/python-modules/boltons/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index f884e164d639..c5c2ecb68bc4 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.2.1"; + version = "21.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mahmoud"; repo = "boltons"; rev = version; - hash = "sha256-iCueZsi/gVbko7MW43vaUQMWRVI/YhmdfN29gD6AgG8="; + hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk="; }; checkInputs = [ @@ -34,12 +34,6 @@ buildPythonPackage rec { }) ]; - disabledTests = [ - # This test is broken without this PR. Merged but not released - # https://github.com/mahmoud/boltons/pull/283 - "test_frozendict" - ]; - pythonImportsCheck = [ "boltons" ]; From 35523580a9edbe51cc75099ff0acf7fbd943cb4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 12:04:40 +0000 Subject: [PATCH 44/62] python310Packages.aesara: 2.7.7 -> 2.7.9 --- pkgs/development/python-modules/aesara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 67b9ee40e28c..5d91bc4de885 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.7.7"; + version = "2.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-Dr4MPNtPGKmViVP2FSF8bvrQ68Dz/ASK/MTRCRUnFOE="; + hash = "sha256-s7qqFSY4teL2uiGg6CkpPtr7lNNAj61nCn83Zr7/JaQ="; }; nativeBuildInputs = [ From 8c10a967f748196308987d8fa041cd1a1e918e07 Mon Sep 17 00:00:00 2001 From: Maria Date: Tue, 26 Jul 2022 08:06:35 -0400 Subject: [PATCH 45/62] balanceofsatoshis: add shell completion --- pkgs/development/node-packages/overrides.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 9d3f74bae7e5..72200cdcc777 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -85,6 +85,16 @@ final: prev: { meta = oldAttrs.meta // { platforms = lib.platforms.linux; }; }); + balanceofsatoshis = prev.balanceofsatoshis.override { + nativeBuildInputs = [ pkgs.installShellFiles ]; + postInstall = '' + installShellCompletion --cmd bos\ + --bash <($out/bin/bos completion bash)\ + --zsh <($out/bin/bos completion zsh)\ + --fish <($out/bin/bos completion fish) + ''; + }; + bitwarden-cli = prev."@bitwarden/cli".override { name = "bitwarden-cli"; }; From 4e7a1d6456fab6c8ea644c116831626b052e9022 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 26 Jul 2022 20:29:53 +0800 Subject: [PATCH 46/62] crabz: 0.7.2 -> 0.7.5 --- pkgs/tools/compression/crabz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix index 5eafb3f56145..67c4cffbc331 100644 --- a/pkgs/tools/compression/crabz/default.nix +++ b/pkgs/tools/compression/crabz/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "crabz"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "0ch9cqarsakihg9ymbdm0ka6wz77z84n4g6cdlcskczc5g3b9gp9"; + sha256 = "sha256-9PZbrdgHX7zOftecvsyVjYUkBlFEt20lYtLSkFcb8dg="; }; - cargoSha256 = "sha256-nrCYlhq/f8gk3NmltAg+xppRJ533ooEpetWvaF2vmP0="; + cargoSha256 = "sha256-tT6RCL5pOAMZw7cQr0BCAde9Y/1FeBBLXF6uXfM1I0A="; nativeBuildInputs = [ cmake ]; From 3a46b467ace6c1f571e37269055bbbcb0b150cc3 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 19 Jul 2022 14:40:30 -0400 Subject: [PATCH 47/62] emscripten: 3.1.15 -> 3.1.17 --- pkgs/development/compilers/emscripten/default.nix | 4 ++-- pkgs/development/compilers/emscripten/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index b8544d01ead3..44ba33247b40 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.15"; + version = "3.1.17"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-aRevSQZsJepRcoeRf5U504FV707ZarpiG8qbD/v3OPg="; + sha256 = "sha256-xOt9Znn5kCcieRHnXk794rMpgTzoR8pIKBXv/GeKcuw="; rev = version; }; diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 7a5316b9b63a..bf7d2c0642db 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,6 +1,6 @@ { "name": "emscripten", - "version": "3.1.15", + "version": "3.1.17", "private": true, "devDependencies": { "es-check": "^6.2.1", From b08cdd38b45da2a621528fbcaee4dc4ee5cdb565 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 26 Jul 2022 21:34:50 +0800 Subject: [PATCH 48/62] csview: 1.0.1 -> 1.1.0 --- pkgs/tools/text/csview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 41ddcfac50a4..c5c51b4de06a 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tllwFUC+Si3PsYPmiO86D3PNdInuIxxhZW5dAuU4K14="; + sha256 = "sha256-yx/gGJ8QGmMaiVw+yWWhswbGpf9YZk2kWoxFXXSETyA="; }; - cargoSha256 = "sha256-j9CwldmxjWYVuiWfAHIV0kr5k/p1BFWHzZiVrv8m7uI="; + cargoSha256 = "sha256-4YJfD8TuQN9aQlbhzpv69YE20tMMIUxq6UdDpJSP7lI="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; From cd935b2d96037d2eee31529d27340c12098d9b07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 13:56:50 +0000 Subject: [PATCH 49/62] python310Packages.deezer-python: 5.3.3 -> 5.4.0 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index c94f3d205ce8..62e92e8dde8d 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.3.3"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; + hash = "sha256-Lp5uIt6Zd8xQBcCWQcwL/YIHixXDpQ6ZTPSinLxr+PY="; }; nativeBuildInputs = [ From ef9826a13b9499851c62c67d0bc4b40f0bfd34f6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 16:54:27 +0200 Subject: [PATCH 50/62] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 3 --- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 79765953e2e2..d2832752465b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3858,6 +3858,7 @@ broken-packages: - persistent-odbc - persistent-protobuf - persistent-ratelimit + - persistent-stm - persistent-template-classy - persistent-typed-db - persistent-zookeeper diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b7b512edeab1..060f0dc0b275 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1033,7 +1033,6 @@ dont-distribute-packages: - condor - conductive-hsc3 - conductive-song - - conduit-aeson - conduit-throttle - conduit-vfs-zip - confcrypt @@ -3311,7 +3310,6 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regex-tdfa_1_3_2 - regex-xmlschema - regexchar - regexp-tries @@ -3534,7 +3532,6 @@ dont-distribute-packages: - servant-streaming-server - servant-swagger-tags - servant-to-elm - - servant-typescript - servant-util - servant-util-beam-pg - servant-waargonaut diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f8c9c7191f05..e1d8c5b6464a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -64788,7 +64788,6 @@ self: { ]; description = "Short description"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -214879,6 +214878,8 @@ self: { testHaskellDepends = [ base hspec stm temporary ]; description = "STM transactions involving persistent storage"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-template" = callPackage @@ -252240,7 +252241,6 @@ self: { ]; description = "TypeScript client generation for Servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "servant-typescript-exe"; }) {}; From c2f7c0902d12ca8e24649915bb563a8dde45cf4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 14:54:29 +0000 Subject: [PATCH 51/62] python310Packages.weconnect: 0.45.0 -> 0.45.1 --- pkgs/development/python-modules/weconnect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 719682eb005e..167a9f8cea58 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.45.0"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-python"; - rev = "v${version}"; - hash = "sha256-iAKw05vMaGTQ/V1uwqbkO2AZOOtsMOfSnponnE5AdXE="; + rev = "refs/tags/v${version}"; + hash = "sha256-uvo5fwP2VWW+wTV26M604axcpYrtl7Atq2jB7m0VVsM="; }; propagatedBuildInputs = [ From f24855188b32eb6730cdc4d0c26f294765dd5ca5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 15:46:16 +0000 Subject: [PATCH 52/62] python310Packages.homematicip: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/homematicip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index df9bf4d718a6..c1db99734cf3 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-z27VGApm5VsDm6VG0DaDOmhFrvRhLLINHtSM/cIiXyY="; + hash = "sha256-1nT5P3HNwwEJSSRbl77DXCuPPxGqiVFXNUK6Q3ZiByU="; }; propagatedBuildInputs = [ From 0577f72388095bea7a8ee4c59b49c63d1b860cd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 15:51:52 +0000 Subject: [PATCH 53/62] python310Packages.pydal: 20220721.1 -> 20220725.1 --- pkgs/development/python-modules/pydal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 8087c66bdb57..314e91746897 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pydal"; - version = "20220721.1"; + version = "20220725.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dOSTpK9HZFZL5/QWK/HTzPAgpsCSyj9r5a57cQpmlhY="; + sha256 = "sha256-/kbAvK6OWUyv0LUcTIAAvSHmhWDBwJszx65qqgytqSE="; }; postPatch = '' From 93c4b657d59689b08ac82d646f19ebd1904c35dc Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Tue, 26 Jul 2022 09:03:52 -0700 Subject: [PATCH 54/62] vultr-cli: 2.12.2 -> 2.14.2 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 6e80c62b7817..40753ffe2163 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.2"; + version = "2.14.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ylSzPfBTIFZXLLxj/LHkzTNqpDZvT43UKIiG4y/aQJQ="; + sha256 = "sha256-Rlill4T9zHdJUVk/46cPknaBXNN+PUGungqRdTMHFz4="; }; vendorSha256 = null; From 562795ba314adc6150237b3482026cf2ea83404e Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:04:25 +0800 Subject: [PATCH 55/62] cargo-expand: 1.0.27 -> 1.0.28 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index ebca19b3cbb3..8a4832dd6fe2 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.27"; + version = "1.0.28"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-lj6B+9AdKhHc71cyzp7TcHmHv3K2ZoXEzMn/d3H0bB4="; + sha256 = "sha256-PiVHA9dcndL301xTUEG4k2hqa4X7mn909/l+oxdkhw4="; }; - cargoSha256 = "sha256-j14l3E+vyeyEMYN+TEsuxlEdWa2Em0B6Y2LoTot2Np8="; + cargoSha256 = "sha256-dfCACQszWhEnTLZFBe64CFrG+eoz0kmrquq7TnHkji4="; buildInputs = lib.optional stdenv.isDarwin libiconv; From f28e8302f4216f40d7f13315648f3de6c028f0f7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 18:40:11 +0200 Subject: [PATCH 56/62] haskellPackages.conduit-aeson: unbreak * Work around broken Setup.hs which fails to parse * Disable doctest-parallel suite * Group doctest-parallel overrides and link the upstream issue for the failure; basically it does not work unless you are using cabal v2 commands. --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 327f850c0470..9d4876533a11 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2570,8 +2570,21 @@ self: super: { # https://github.com/klapaucius/vector-hashtables/issues/11 vector-hashtables = doJailbreak super.vector-hashtables; - # doctests don‘t work. + # doctest-parallel is broken with v1-style cabal-install / Setup.hs + # https://github.com/martijnbastiaan/doctest-parallel/issues/22 doctest-parallel = dontCheck super.doctest-parallel; + clash-prelude = dontCheck super.clash-prelude; + + # Ships a broken Setup.hs + # https://github.com/lehins/conduit-aeson/issues/1 + conduit-aeson = overrideCabal (drv: { + postPatch = '' + ${drv.postPatch or ""} + rm Setup.hs + ''; + # doctest suite uses doctest-parallel which still doesn't work in nixpkgs + testTarget = "tests"; + }) super.conduit-aeson; # Disabling doctests. regex-tdfa = overrideCabal { @@ -2626,7 +2639,4 @@ in { purescript-ast = purescriptStOverride super.purescript-ast; purenix = purescriptStOverride super.purenix; - - # tests use doctest-parallel which produces some errors during testing - clash-prelude = dontCheck super.clash-prelude; }) From 65f8c8db56a3904037fb7745b3cf7f7b00f2e9d8 Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 26 Jul 2022 01:07:03 +0200 Subject: [PATCH 57/62] fornalder: init at unstable-2022-07-23 --- .../version-management/fornalder/Cargo.lock | 597 ++++++++++++++++++ .../version-management/fornalder/default.nix | 29 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 628 insertions(+) create mode 100644 pkgs/applications/version-management/fornalder/Cargo.lock create mode 100644 pkgs/applications/version-management/fornalder/default.nix diff --git a/pkgs/applications/version-management/fornalder/Cargo.lock b/pkgs/applications/version-management/fornalder/Cargo.lock new file mode 100644 index 000000000000..5f1cafc9096a --- /dev/null +++ b/pkgs/applications/version-management/fornalder/Cargo.lock @@ -0,0 +1,597 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "either" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "backtrace", + "version_check", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fornalder" +version = "0.1.0" +dependencies = [ + "chrono", + "error-chain", + "io", + "itertools", + "regex", + "rusqlite", + "serde", + "serde_json", + "structopt", + "tempfile", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c839d30624bc6b3dced6a4652823d1967fb7939d4848ad002d509b1fc916b2" + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libsqlite3-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[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 = "rusqlite" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "memchr", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "serde" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/applications/version-management/fornalder/default.nix new file mode 100644 index 000000000000..9dd25cf12e3c --- /dev/null +++ b/pkgs/applications/version-management/fornalder/default.nix @@ -0,0 +1,29 @@ +{ fetchFromGitHub, rustPlatform, lib }: + +rustPlatform.buildRustPackage rec { + pname = "fornalder"; + version = "unstable-2022-07-23"; + + src = fetchFromGitHub { + owner = "hpjansson"; + repo = pname; + rev = "44129f01910a9f16d97d0a3d8b1b376bf3338ea6"; + sha256 = "sha256-YODgR98SnpL6SM2nKrnzhpsEzYQFqduqigua/SXhazk="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + # tests don't typecheck + doCheck = false; + + meta = with lib; { + description = "Visualize long-term trends in collections of Git repositories"; + homepage = "https://github.com/hpjansson/fornalder"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 014ba7e81648..cc90e6331f36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6394,6 +6394,8 @@ with pkgs; gtk = gtk3; }; + fornalder = callPackage ../applications/version-management/fornalder { }; + free42 = callPackage ../applications/misc/free42 { }; galen = callPackage ../development/tools/galen {}; From 8613bd99b1d042ad1d0d53335af7ef21fa871706 Mon Sep 17 00:00:00 2001 From: Craftman7 Date: Tue, 26 Jul 2022 11:07:24 -0700 Subject: [PATCH 58/62] bitwarden: 2022.5.1 -> 2022.6.2 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 9ae5da86497b..e440ef4eedb8 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "2022.5.1"; + version = "2022.6.2"; src = fetchurl { url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-L6Mow4wC5PlpR9IYXOztW4FyGDq9wWEuV2PvzQ7M/rU="; + sha256 = "sha256-FaYxnCUsKBMbPhiNKcB4eZFDN0fC1nfG6Si4UK6ekh0="; }; desktopItem = makeDesktopItem { From 4cd955979ca1d418a60a2f1fe5a7c645d11fcc61 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 26 Jul 2022 12:49:27 -0500 Subject: [PATCH 59/62] bluespec: set mainProgram=bsc Signed-off-by: Austin Seipp --- pkgs/development/compilers/bluespec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index ae28923871c0..d6accbdbf1fc 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -126,6 +126,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/B-Lang-org/bsc"; license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; + mainProgram = "bsc"; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with lib.maintainers; [ jcumming thoughtpolice ]; From b95fa37c60d57a087e7799822d8afb56e8301092 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 26 Jul 2022 22:03:42 +0300 Subject: [PATCH 60/62] =?UTF-8?q?nnn:=204.5=20=E2=86=92=204.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/file-managers/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 87c43628c4f0..eed48c4a7d77 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk="; + sha256 = "sha256-+EAKOXZp1kxA2X3e16ItjPT7Sa3WZuP2oxOdXkceTIY="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); From d30af7ad941543392aa5ebf29781e44306ec0b91 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 26 Jul 2022 21:38:55 +0200 Subject: [PATCH 61/62] got: 0.73 -> 0.74 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index cc00794ba7ad..2a45b5a8abd0 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.73"; + version = "0.74"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "0x583h9f6jnqfwy48b43s1myrgbngn128m4ivmf9gcsvfiz3lxgh"; + sha256 = "sha256-XElSCdFh24rf2gosjS0BG+VNqLZNLYeYkUy4t5RIdv4="; }; nativeBuildInputs = [ pkg-config ]; From 41f40771488e99c914a3da5de086cf794242c6d7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Jul 2022 20:54:58 +0000 Subject: [PATCH 62/62] =?UTF-8?q?mobile-broadband-provider-info:=202022051?= =?UTF-8?q?1=20=E2=86=92=2020220725?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/compare/20220511...20220725 --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 8f5ce0d02025..85f45ec516df 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20220511"; + version = "20220725"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-dfk+iGZh8DWYMsPigjyvqG505AgEJbjOCpw7DQqyp3Q="; + sha256 = "sha256-SEWuAcKH8t+wIrxi1ZoUiHP/xKZz9RAgViZXQm1jKs0="; }; nativeBuildInputs = [