diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-07 18:01:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-07 18:01:18 +0000 |
commit | 4df86afbd7f8d0e95da4d53b7de3408cb9d703a5 (patch) | |
tree | 83f1acf0f12ac5bef475471d33dccbe2674e2900 | |
parent | bfb2d0dfae7559542b99615e261b01eb6f85fa96 (diff) | |
parent | f85fe5fc293d310e635b6c0363819d7ca1159528 (diff) |
Merge staging-next into staging
152 files changed, 3041 insertions, 1318 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23975a5a33a69..fe4e8bdf24b5a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17018,6 +17018,12 @@ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; + Silver-Golden = { + name = "Brendan Golden"; + email = "github+nixpkgs@brendan.ie"; + github = "Silver-Golden"; + githubId = 7858375; + }; simarra = { name = "simarra"; email = "loic.martel@protonmail.com"; diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 881cf5fd48376..5dc52abdd668b 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -7,8 +7,11 @@ set -eu -o pipefail # Stackage solver to use, LTS or Nightly # (should be capitalized like the display name) SOLVER=LTS +# Stackage solver verson, if any. Use latest if empty +VERSION=21 TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER +readonly VERSION readonly TMP_TEMPLATE toLower() { @@ -23,7 +26,7 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac trap 'rm "${tmpfile}" "${tmpfile_new}"' 0 touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors. -curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile" +curl -L -s "https://stackage.org/$(toLower "$SOLVER")${VERSION:+-$VERSION}/cabal.config" >"$tmpfile" old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g') version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")" diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index e8205e2562eeb..5de33387ff23c 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -97,6 +97,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `systemd.oomd.enableUserServices` is renamed to `systemd.oomd.enableUserSlices`. +- `security.pam.enableSSHAgentAuth` now requires `services.openssh.authorizedKeysFiles` to be non-empty, + which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work. + ## Other Notable Changes {#sec-release-24.05-notable-changes} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 893a49e5763a8..5aee2340932ca 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -497,6 +497,7 @@ ./services/development/jupyterhub/default.nix ./services/development/livebook.nix ./services/development/lorri.nix + ./services/development/nixseparatedebuginfod.nix ./services/development/rstudio-server/default.nix ./services/development/zammad.nix ./services/display-managers/greetd.nix @@ -1175,6 +1176,7 @@ ./services/search/typesense.nix ./services/security/aesmd.nix ./services/security/authelia.nix + ./services/security/bitwarden-directory-connector-cli.nix ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 1edf935d1649e..29c567783e27a 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -284,6 +284,7 @@ in # Preferences are converted into a policy programs.firefox.policies = { + DisableAppUpdate = true; Preferences = (mapAttrs (_: value: { Value = value; Status = cfg.preferencesStatus; }) cfg.preferences); diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c99615d5a6362..2f777f874f23e 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1456,6 +1456,13 @@ in `security.pam.zfs.enable` requires enabling ZFS (`boot.zfs.enabled` or `boot.zfs.enableUnstable`). ''; } + { + assertion = config.security.pam.enableSSHAgentAuth -> config.services.openssh.authorizedKeysFiles != []; + message = '' + `security.pam.enableSSHAgentAuth` requires `services.openssh.authorizedKeysFiles` to be a non-empty list. + Did you forget to set `services.openssh.enable` ? + ''; + } ]; environment.systemPackages = diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix new file mode 100644 index 0000000000000..daf85153d339f --- /dev/null +++ b/nixos/modules/services/development/nixseparatedebuginfod.nix @@ -0,0 +1,105 @@ +{ pkgs, lib, config, ... }: +let + cfg = config.services.nixseparatedebuginfod; + url = "127.0.0.1:${toString cfg.port}"; +in +{ + options = { + services.nixseparatedebuginfod = { + enable = lib.mkEnableOption "separatedebuginfod, a debuginfod server providing source and debuginfo for nix packages"; + port = lib.mkOption { + description = "port to listen"; + default = 1949; + type = lib.types.port; + }; + nixPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.nix; + defaultText = lib.literalExpression "pkgs.nix"; + description = '' + The version of nix that nixseparatedebuginfod should use as client for the nix daemon. It is strongly advised to use nix version >= 2.18, otherwise some debug info may go missing. + ''; + }; + allowOldNix = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Do not fail evaluation when {option}`services.nixseparatedebuginfod.nixPackage` is older than nix 2.18. + ''; + }; + }; + }; + config = lib.mkIf cfg.enable { + assertions = [ { + assertion = cfg.allowOldNix || (lib.versionAtLeast cfg.nixPackage.version "2.18"); + message = "nixseparatedebuginfod works better when `services.nixseparatedebuginfod.nixPackage` is set to nix >= 2.18 (instead of ${cfg.nixPackage.name}). Set `services.nixseparatedebuginfod.allowOldNix` to bypass."; + } ]; + + systemd.services.nixseparatedebuginfod = { + wantedBy = [ "multi-user.target" ]; + wants = [ "nix-daemon.service" ]; + after = [ "nix-daemon.service" ]; + path = [ cfg.nixPackage ]; + serviceConfig = { + ExecStart = [ "${pkgs.nixseparatedebuginfod}/bin/nixseparatedebuginfod -l ${url}" ]; + Restart = "on-failure"; + CacheDirectory = "nixseparatedebuginfod"; + # nix does not like DynamicUsers in allowed-users + User = "nixseparatedebuginfod"; + Group = "nixseparatedebuginfod"; + + # hardening + # Filesystem stuff + ProtectSystem = "strict"; # Prevent writing to most of / + ProtectHome = true; # Prevent accessing /home and /root + PrivateTmp = true; # Give an own directory under /tmp + PrivateDevices = true; # Deny access to most of /dev + ProtectKernelTunables = true; # Protect some parts of /sys + ProtectControlGroups = true; # Remount cgroups read-only + RestrictSUIDSGID = true; # Prevent creating SETUID/SETGID files + PrivateMounts = true; # Give an own mount namespace + RemoveIPC = true; + UMask = "0077"; + + # Capabilities + CapabilityBoundingSet = ""; # Allow no capabilities at all + NoNewPrivileges = true; # Disallow getting more capabilities. This is also implied by other options. + + # Kernel stuff + ProtectKernelModules = true; # Prevent loading of kernel modules + SystemCallArchitectures = "native"; # Usually no need to disable this + ProtectKernelLogs = true; # Prevent access to kernel logs + ProtectClock = true; # Prevent setting the RTC + + # Networking + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + + # Misc + LockPersonality = true; # Prevent change of the personality + ProtectHostname = true; # Give an own UTS namespace + RestrictRealtime = true; # Prevent switching to RT scheduling + MemoryDenyWriteExecute = true; # Maybe disable this for interpreters like python + RestrictNamespaces = true; + }; + }; + + users.users.nixseparatedebuginfod = { + isSystemUser = true; + group = "nixseparatedebuginfod"; + }; + + users.groups.nixseparatedebuginfod = { }; + + nix.settings.extra-allowed-users = [ "nixseparatedebuginfod" ]; + + environment.variables.DEBUGINFOD_URLS = "http://${url}"; + + environment.systemPackages = [ + # valgrind support requires debuginfod-find on PATH + (lib.getBin pkgs.elfutils) + ]; + + environment.etc."gdb/gdbinit.d/nixseparatedebuginfod.gdb".text = "set debuginfod enabled on"; + + }; +} diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix new file mode 100644 index 0000000000000..18c02e22fd7e6 --- /dev/null +++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix @@ -0,0 +1,323 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.services.bitwarden-directory-connector-cli; +in { + options.services.bitwarden-directory-connector-cli = { + enable = mkEnableOption "Bitwarden Directory Connector"; + + package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {}; + + domain = mkOption { + type = types.str; + description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on."; + example = "https://vaultwarden.example.com"; + }; + + user = mkOption { + type = types.str; + description = lib.mdDoc "User to run the program."; + default = "bwdc"; + }; + + interval = mkOption { + type = types.str; + default = "*:0,15,30,45"; + description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax."; + }; + + ldap = mkOption { + description = lib.mdDoc '' + Options to configure the LDAP connection. + If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + ssl = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use TLS."; + }; + startTls = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use STARTTLS."; + }; + + hostname = mkOption { + type = types.str; + description = lib.mdDoc "The host the LDAP is accessible on."; + example = "ldap.example.com"; + }; + + port = mkOption { + type = types.port; + default = 389; + description = lib.mdDoc "Port LDAP is accessible on."; + }; + + ad = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP Server is an Active Directory."; + }; + + pagedSearch = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP server paginates search results."; + }; + + rootPath = mkOption { + type = types.str; + description = lib.mdDoc "Root path for LDAP."; + example = "dc=example,dc=com"; + }; + + username = mkOption { + type = types.str; + description = lib.mdDoc "The user to authenticate as."; + example = "cn=admin,dc=example,dc=com"; + }; + }; + }); + }; + + sync = mkOption { + description = lib.mdDoc '' + Options to configure what gets synced. + If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + removeDisabled = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group."; + }; + + overwriteExisting = mkOption { + type = types.bool; + default = false; + description = + lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details."; + }; + + largeImport = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups."; + }; + + memberAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists members in a LDAP group."; + example = "uniqueMember"; + }; + + creationDateAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists a user's creation date."; + example = "whenCreated"; + }; + + useEmailPrefixSuffix = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email."; + }; + emailPrefixAttribute = mkOption { + type = types.str; + description = lib.mdDoc "The attribute that contains the users username."; + example = "accountName"; + }; + emailSuffix = mkOption { + type = types.str; + description = lib.mdDoc "Suffix for the email, normally @example.com."; + example = "@example.com"; + }; + + users = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Sync users."; + }; + userPath = mkOption { + type = types.str; + description = lib.mdDoc "User directory, relative to root."; + default = "ou=users"; + }; + userObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "Class that users must have."; + default = "inetOrgPerson"; + }; + userEmailAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a users email."; + default = "mail"; + }; + userFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for users."; + example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)"; + default = ""; + }; + + groups = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to sync ldap groups into BitWarden."; + }; + groupPath = mkOption { + type = types.str; + description = lib.mdDoc "Group directory, relative to root."; + default = "ou=groups"; + }; + groupObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "A class that groups will have."; + default = "groupOfNames"; + }; + groupNameAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a name of group."; + default = "cn"; + }; + groupFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for groups."; + example = "(cn=sales)"; + default = ""; + }; + }; + }); + }; + + secrets = { + ldap = mkOption { + type = types.str; + description = "Path to file that contains LDAP password for user in {option}`ldap.username"; + }; + + bitwarden = { + client_path_id = mkOption { + type = types.str; + description = "Path to file that contains Client ID."; + }; + client_path_secret = mkOption { + type = types.str; + description = "Path to file that contains Client Secret."; + }; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups."${cfg.user}" = {}; + users.users."${cfg.user}" = { + isSystemUser = true; + group = cfg.user; + }; + + systemd = { + timers.bitwarden-directory-connector-cli = { + description = "Sync timer for Bitwarden Directory Connector"; + wantedBy = ["timers.target"]; + after = ["network-online.target"]; + timerConfig = { + OnCalendar = cfg.interval; + Unit = "bitwarden-directory-connector-cli.service"; + Persistent = true; + }; + }; + + services.bitwarden-directory-connector-cli = { + description = "Main process for Bitwarden Directory Connector"; + path = [pkgs.jq]; + + environment = { + BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp"; + BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true"; + }; + + serviceConfig = { + Type = "oneshot"; + User = "${cfg.user}"; + PrivateTmp = true; + preStart = '' + set -eo pipefail + + # create the config file + ${lib.getExe cfg.package} data-file + touch /tmp/data.json.tmp + chmod 600 /tmp/data.json{,.tmp} + + ${lib.getExe cfg.package} config server ${cfg.domain} + + # now login to set credentials + export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" + export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" + ${lib.getExe cfg.package} login + + jq '.authenticatedAccounts[0] as $account + | .[$account].directoryConfigurations.ldap |= $ldap_data + | .[$account].directorySettings.organizationId |= $orgID + | .[$account].directorySettings.sync |= $sync_data' \ + --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ + --arg orgID "''${BW_CLIENTID//organization.}" \ + --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ + /tmp/data.json \ + > /tmp/data.json.tmp + + mv -f /tmp/data.json.tmp /tmp/data.json + + # final config + ${lib.getExe cfg.package} config directory 0 + ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} + ''; + + ExecStart = "${lib.getExe cfg.package} sync"; + }; + }; + }; + }; + + meta.maintainers = with maintainers; [Silver-Golden]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b55e4b9fa71fd..4b20a63124377 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -605,6 +605,7 @@ in { nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; + nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; non-default-filesystems = handleTest ./non-default-filesystems.nix {}; diff --git a/nixos/tests/nixseparatedebuginfod.nix b/nixos/tests/nixseparatedebuginfod.nix new file mode 100644 index 0000000000000..7c192a73c7064 --- /dev/null +++ b/nixos/tests/nixseparatedebuginfod.nix @@ -0,0 +1,80 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + secret-key = "key-name:/COlMSRbehSh6YSruJWjL+R0JXQUKuPEn96fIb+pLokEJUjcK/2Gv8Ai96D7JGay5gDeUTx5wdpPgNvum9YtwA=="; + public-key = "key-name:BCVI3Cv9hr/AIveg+yRmsuYA3lE8ecHaT4Db7pvWLcA="; +in +{ + name = "nixseparatedebuginfod"; + /* A binary cache with debug info and source for nix */ + nodes.cache = { pkgs, ... }: { + services.nix-serve = { + enable = true; + secretKeyFile = builtins.toFile "secret-key" secret-key; + openFirewall = true; + }; + system.extraDependencies = [ + pkgs.nix.debug + pkgs.nix.src + pkgs.sl + ]; + }; + /* the machine where we need the debuginfo */ + nodes.machine = { + imports = [ + ../modules/installer/cd-dvd/channel.nix + ]; + services.nixseparatedebuginfod.enable = true; + nix.settings = { + substituters = lib.mkForce [ "http://cache:5000" ]; + trusted-public-keys = [ public-key ]; + }; + environment.systemPackages = [ + pkgs.valgrind + pkgs.gdb + (pkgs.writeShellScriptBin "wait_for_indexation" '' + set -x + while debuginfod-find debuginfo /run/current-system/sw/bin/nix |& grep 'File too large'; do + sleep 1; + done + '') + ]; + }; + testScript = '' + start_all() + cache.wait_for_unit("nix-serve.service") + cache.wait_for_open_port(5000) + machine.wait_for_unit("nixseparatedebuginfod.service") + machine.wait_for_open_port(1949) + + with subtest("show the config to debug the test"): + machine.succeed("nix --extra-experimental-features nix-command show-config |& logger") + machine.succeed("cat /etc/nix/nix.conf |& logger") + with subtest("check that the binary cache works"): + machine.succeed("nix-store -r ${pkgs.sl}") + + # nixseparatedebuginfod needs .drv to associate executable -> source + # on regular systems this would be provided by nixos-rebuild + machine.succeed("nix-instantiate '<nixpkgs>' -A nix") + + machine.succeed("timeout 600 wait_for_indexation") + + # test debuginfod-find + machine.succeed("debuginfod-find debuginfo /run/current-system/sw/bin/nix") + + # test that gdb can fetch source + out = machine.succeed("gdb /run/current-system/sw/bin/nix --batch -x ${builtins.toFile "commands" '' + start + l + ''}") + print(out) + assert 'int main(' in out + + # test that valgrind can display location information + # this relies on the fact that valgrind complains about nix + # libgc helps in this regard, and we also ask valgrind to show leak kinds + # which are usually false positives. + out = machine.succeed("valgrind --leak-check=full --show-leak-kinds=all nix-env --version 2>&1") + print(out) + assert 'main.cc' in out + ''; +}) diff --git a/nixos/tests/typesense.nix b/nixos/tests/typesense.nix index 4f07a2e194be8..87ed248257ea0 100644 --- a/nixos/tests/typesense.nix +++ b/nixos/tests/typesense.nix @@ -18,6 +18,7 @@ in { testScript = '' machine.wait_for_unit("typesense.service") machine.wait_for_open_port(${toString testPort}) - assert machine.succeed("curl --fail http://localhost:${toString testPort}/health") == '{"ok":true}' + # After waiting for the port, typesense still hasn't initialized the database, so wait until we can connect successfully + assert machine.wait_until_succeeds("curl --fail http://localhost:${toString testPort}/health") == '{"ok":true}' ''; }) diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index ab9b2ebcd9619..86a50ef0606e2 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -2,6 +2,7 @@ , stdenv , fetchgit , fetchzip +, fetchpatch , alsa-lib , aubio , boost @@ -79,6 +80,12 @@ stdenv.mkDerivation rec { # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096 ./as-flags.patch ./default-plugin-search-paths.patch + + # Fix build with libxml2 2.12. + (fetchpatch { + url = "https://github.com/Ardour/ardour/commit/e995daa37529715214c6c4a2587e4134aaaba02f.patch"; + hash = "sha256-EpXOIIObOwwcNgNma0E3nvaBad3930sagDjBpa+78WI="; + }) ]; # Ardour's wscript requires git revision and date to be available. diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix index 8b2e05e4a9ecd..529acfa097216 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix @@ -1,10 +1,10 @@ # Manually packaged until it is upstreamed to melpa # See https://github.com/devonsparks/wat-mode/issues/1 -{ lib, trivialBuild, fetchFromGitHub, fetchpatch, emacs }: +{ lib, melpaBuild, fetchFromGitHub, writeText }: -trivialBuild rec { +melpaBuild rec { pname = "wat-mode"; - version = "unstable-2022-07-13"; + version = "20220713.1"; src = fetchFromGitHub { owner = "devonsparks"; @@ -13,11 +13,16 @@ trivialBuild rec { hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto="; }; - meta = with lib; { + commit = "46b4df83e92c585295d659d049560dbf190fe501"; + + recipe = writeText "recipe" '' + (wat-mode :repo "devonsparks/wat-mode" :fetcher github) + ''; + + meta = { homepage = "https://github.com/devonsparks/wat-mode"; description = "An Emacs major mode for WebAssembly's text format"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nagy ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nagy ]; }; } diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 960cefc67871e..997aadbfb5495 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -15,13 +15,13 @@ let in { nightly = qt6Packages.callPackage ./generic.nix rec { pname = "citra-nightly"; - version = "2043"; + version = "2070"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-nightly"; rev = "nightly-${version}"; - sha256 = "sha256-26M3uzqp4rUMOhr619UooupZT11B03IJfamUPNkceQk="; + sha256 = "1rmc7dk7wzmxgkq7xsmx9wscszhcfr3mkvnykwgamrcb9bm8p5rb"; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { canary = qt6Packages.callPackage ./generic.nix rec { pname = "citra-canary"; - version = "2695"; + version = "2740"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-canary"; rev = "canary-${version}"; - sha256 = "sha256-090er4aUGze8bk3DIFZoa+/6EcJhr4bim3nWgZHs1mo="; + sha256 = "0m11xy0ad9sy7zsnwnb7vad3g0g78v747a1abp612ybg0aczwf9l"; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index 21b60bb4056e7..c167aef7e7743 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -15,6 +15,7 @@ , enet , ffmpeg , fmt +, gamemode , glslang , httplib , inih @@ -108,6 +109,9 @@ stdenv.mkDerivation { # Add versions echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake + + # Add gamemode + substituteInPlace externals/gamemode/include/gamemode_client.h --replace "libgamemode.so.0" "${lib.getLib gamemode}/lib/libgamemode.so.0" ''; postInstall = let @@ -124,7 +128,7 @@ stdenv.mkDerivation { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://citra-emu.org"; - description = "The ${branch} branch of an open-source emulator for the Ninteno 3DS"; + description = "The ${branch} branch of an open-source emulator for the Nintendo 3DS"; longDescription = '' A Nintendo 3DS Emulator written in C++ Using the nightly branch is recommended for general usage. diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index 4b0c5f5f2cc2f..88fc83f93c8b5 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.1"; + version = "45.2"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-/kRifa7zrZbBaaLlRhDmZxj4k9cN/SXUDTBskYQ7zjk="; + hash = "sha256-iQd4F/xzXMjonbUWKPUuqKxmwZTfxqekLgA8TCnE3T4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ed573d1322d5a..83738fd181494 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication { matplotlib pbkdf2 protobuf - py_scrypt + py-scrypt pysocks qrcode requests diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 36c29cd2444ca..e16d7312f5df1 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-PF7vjbmoNSBD9C6JOB1s5NHnBEkv1LD/3RZAB0/HFPc="; + hash = "sha256-xQ02jmPuu1IHkQCCJn2FVPcJRbwN+k8FhsZyDX0oHaw="; }; - cargoHash = "sha256-iJblgcwn9uCl2X0AjG+dlAwdwwyZ321LRBFjDCZOr/A="; + cargoHash = "sha256-DSLIH6swVQXHrqKBxlrhNTG5maRmUi6Ndmuuv0Vo3Ak="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 376038f46cc92..79a97f0501490 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.13.12"; + version = "2.13.13"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-h+aprE7D2bZcKgBoOKwPGgiM2Yo05c3TZaR1elOsp70="; - x86_64-darwin = "sha256-4VHipPJ3Tkf7NSy7sytk793ApOQm7cRsl5DNO0xjpIw="; - aarch64-darwin = "sha256-LW7myTExWblFDke/o/E7tNBRBrkyNkOvnHiztIT7x3Q="; + x86_64-linux = "sha256-Cc9NhYrYimj1NjbwnEueQzqC6yCAZi0YUtmJRorarCk="; + x86_64-darwin = "sha256-tUdTcr5CkGqEdTuGwZvBmwMW3oCCXwdWnaXjjATHjQg="; + aarch64-darwin = "sha256-Xh54WrLbHcbGMkz9ZN07ZuSwelHdj97sH1eQb0cgAQg="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 0876bf6c15efb..3960556f4d8ea 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-G5/Sb/suTUkpR6OGlOawLVGLTthcrp78Y+5mxlndfA4="; + hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw="; }; - cargoHash = "sha256-7P93mttZ9W76lpGPKN33cgr4nEaHRlDQWov+TUbDHkM="; + cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index cbdc8e64aa9d2..fdb7d3ac98793 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "45.1"; + version = "45.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "v8wGv0vEe70CwVaNHkZL8Wox5iv3A7SaoTsI2zihqMo="; + sha256 = "8PLFeaW+7f5WU7x/4kSBxNaqxd0fccHnoghZXzx473Y="; }; patches = [ diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index bb768763fb93e..b138c19282563 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gMSaJM1qDUUHucVMEiN7VyEm2jWDYBPujy3cQ8SRtHk="; + sha256 = "sha256-GGZjqXw0Fi5QdQjVrw//sDVA8oRKADCwHeRY22z7bko="; }; vendorHash = null; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index ee114446ac1f4..16a4e9b200c14 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -11,19 +11,22 @@ , pugixml , sqlite , tinyxml +, boost , wrapGAppsHook , wxGTK32 , gtk3 , xdg-utils +, CoreServices +, Security }: stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.63.1"; + version = "3.66.4"; src = fetchurl { - url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38="; + url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz"; + hash = "sha256-pA8E4C76rntQ0VFe4cNsSw5EWBhWbEUORAv9bHDpsgM="; }; configureFlags = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ + boost dbus gettext gnutls @@ -46,7 +50,11 @@ stdenv.mkDerivation rec { wxGTK32 gtk3 xdg-utils - ]; + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + + preBuild = lib.optionalString (stdenv.isDarwin) '' + export MACOSX_DEPLOYMENT_TARGET=11.0 + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 792a785317f8d..a6a6efa772661 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.50.2"; + version = "3.50.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gYgjez2TGnOrire1c5/0Pqoky8mtjnK4I5KZ9pizHmY="; + sha256 = "4vpZQTdq1X4H0mc/hnbDH38rBo1J9o6g+4uv6rtSm+0="; }; patches = [ diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 1df9a4bbd0281..fac8172c1d860 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.4"; + version = "1.27"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kQXojI57NYZgu3qXjtOL/a48YnXhuA6FEazhJ7jntqk="; + hash = "sha256-M2uE+/hYUP/l9l5zP/lHJsbMzfQ77cEJBFzbmX29gzM="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 3acd66f790848..d279bd1e2cfd1 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,20 +1,28 @@ { lib , fetchFromGitHub , python3 +, runtimeShell }: python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.32.4"; + version = "8.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9KuMPqvM8ZCTuomc0R9MBxsK3KIpukDTrlwU6MHysK0="; + hash = "sha256-F4c/lgp7J6LLye+f3FpzaXz3zM7R+jXxTziPlVbxFxA="; }; + postPatch = '' + patchShebangs --build tests/ + patchShebangs --host snakemake/executors/jobscript.sh + substituteInPlace snakemake/shell.py \ + --replace "/bin/sh" "${runtimeShell}" + ''; + propagatedBuildInputs = with python3.pkgs; [ appdirs configargparse @@ -23,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { docutils gitpython humanfriendly + immutables jinja2 jsonschema nbformat @@ -32,6 +41,9 @@ python3.pkgs.buildPythonApplication rec { requests reretry smart-open + snakemake-interface-executor-plugins + snakemake-interface-common + snakemake-interface-storage-plugins stopit tabulate throttler @@ -46,31 +58,29 @@ python3.pkgs.buildPythonApplication rec { # setup. nativeCheckInputs = with python3.pkgs; [ + numpy pandas pytestCheckHook requests-mock - pillow + snakemake-executor-plugin-cluster-generic ]; disabledTestPaths = [ - "tests/test_slurm.py" - "tests/test_tes.py" - "tests/test_tibanna.py" - "tests/test_linting.py" - "tests/test_google_lifesciences.py" - "tests/test_conda_python_script/test_script.py" + "tests/test_conda_python_3_7_script/test_script.py" ]; disabledTests = [ - # Tests require network access - "test_github_issue1396" - "test_github_issue1460" + "test_deploy_sources" ]; pythonImportsCheck = [ "snakemake" ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + meta = with lib; { homepage = "https://snakemake.github.io"; license = licenses.mit; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index e0f20d1467f61..0f3c106a7e1fb 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -45,5 +45,12 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.schneefux ]; mainProgram = "gogs"; + knownVulnerabilities = [ '' + Gogs has known unpatched vulnerabilities and upstream maintainers appears to be unresponsive. + + More information can be found in forgejo's blogpost: https://forgejo.org/2023-11-release-v1-20-5-1/ + + You might want to consider migrating to Gitea or forgejo. + '' ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 0027fa722596a..e0afa7d932c67 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -64,6 +64,17 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy ''; passthru = { inherit scriptName; }; - meta.platforms = lib.platforms.all; + meta = { + platforms = lib.platforms.all; + } // ( + let pos = + if (args.meta or {}) ? description then + builtins.unsafeGetAttrPos "description" args.meta + else + builtins.unsafeGetAttrPos "pname" args; + in lib.optionalAttrs + (pos != null) + { position = "${pos.file}:${toString pos.line}"; } + ); }) )) diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index 20de5d88fd331..9d0c7dafc1dbf 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, unstableGitUpdater , buildLua }: buildLua { @@ -12,6 +13,7 @@ buildLua { rev = "b26825316e3329882206ae78dc903ebc4613f039"; hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; }; + passthru.updateScript = unstableGitUpdater {}; meta = { description = "Automatically skips chapters based on title"; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 4f90b0c62ed05..aaf9afcc0d52b 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,14 +1,22 @@ -{ lib, fetchgit, buildLua -, yad, mkvtoolnix-cli, libnotify }: +{ lib +, fetchgit +, unstableGitUpdater + +, buildLua +, libnotify +, mkvtoolnix-cli +, yad +}: buildLua { pname = "mpv-convert-script"; - version = "2016-03-18"; + version = "unstable-2015-07-02"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; sha256 = "13m7l4sy2r8jv2sfrb3vvqvnim4a9ilnv28q5drlg09v298z3mck"; }; + passthru.updateScript = unstableGitUpdater {}; patches = [ ./convert.patch ]; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 4c385b766c78a..69eba782cc1d7 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -1,4 +1,4 @@ -{ lib, buildLua, fetchFromGitHub, makeWrapper }: +{ lib, buildLua, fetchFromGitHub, makeWrapper, unstableGitUpdater }: buildLua { pname = "video-cutter"; @@ -10,6 +10,7 @@ buildLua { rev = "01a0396c075d5f8bbd1de5b571e6231f8899ab65"; sha256 = "sha256-veoRFzUCRH8TrvR7x+WWoycpDyxqrJZ/bnp61dVc0pE="; }; + passthru.updateScript = unstableGitUpdater {}; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 158a7c491007b..3451b6e3dc475 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -72,7 +72,9 @@ let mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; + quack = callPackage ./quack.nix { }; quality-menu = callPackage ./quality-menu.nix { }; + reload = callPackage ./reload.nix { }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix index 2955dfb7c0c87..618c74adea930 100644 --- a/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix +++ b/pkgs/applications/video/mpv/scripts/inhibit-gnome.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, mpv-unwrapped }: +{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, dbus, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-inhibit-gnome"; @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index cc230c2f1f432..338f0a8dd482f 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, mpv-unwrapped, ffmpeg }: +{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, glib, mpv-unwrapped, ffmpeg }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { rev = version; hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; }; + passthru.updateScript = gitUpdater {}; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index ec25801edd221..874263f7b2d20 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,4 +1,4 @@ -{ lib, buildLua, fetchFromGitHub, yt-dlp }: +{ lib, buildLua, fetchFromGitHub, unstableGitUpdater, yt-dlp }: buildLua rec { pname = "mpv-playlistmanager"; @@ -10,6 +10,7 @@ buildLua rec { rev = "579490c7ae1becc129736b7632deec4f3fb90b99"; hash = "sha256-swOtoB8UV/HPTpQRGXswAfUYsyC2Nj/QRIkGP8X1jk0="; }; + passthru.updateScript = unstableGitUpdater {}; postPatch = '' substituteInPlace playlistmanager.lua \ diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index b155846750dc9..5645d6a65f6bf 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -2,7 +2,7 @@ , buildLua , fetchFromGitHub , luaPackages -, nix-update-script +, unstableGitUpdater }: buildLua { @@ -15,15 +15,12 @@ buildLua { rev = "6b5863f68275b3dc91c2507284c039ec8a4cbd97"; hash = "sha256-rJamBm6FyxWcJO7VXXOUTO9piWCkPfEVdqGKGeJ/h0c="; }; + passthru.updateScript = unstableGitUpdater {}; dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; scriptPath = "build/webm.lua"; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; - meta = with lib; { description = "Simple WebM maker for mpv, with no external dependencies"; homepage = "https://github.com/ekisu/mpv-webm"; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 9c1c6ce80f621..c30c450a28c00 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,6 +1,7 @@ { lib , buildLua , fetchFromGitHub +, gitUpdater , curl , wl-clipboard , xclip @@ -16,6 +17,9 @@ buildLua rec { rev = "v${version}"; sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; postPatch = '' substituteInPlace utils/forvo.lua \ diff --git a/pkgs/applications/video/mpv/scripts/quack.nix b/pkgs/applications/video/mpv/scripts/quack.nix new file mode 100644 index 0000000000000..e7138de928779 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/quack.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, unstableGitUpdater +, buildLua }: + +buildLua rec { + pname = "mpv-quack"; + + version = "unstable-2020-05-26"; + src = fetchFromGitHub { + owner = "CounterPillow"; + repo = pname; + rev = "1c87f36f9726d462dd112188c04be54d85692cf3"; + hash = "sha256-dEnJbS8RJoAxpKINdoMHN4l7vpEdf7+C5JVWpK0VXMw="; + }; + passthru.updateScript = unstableGitUpdater {}; + + meta = { + description = "Reduce audio volume after seeking"; + longDescription = '' + quack is an mpv script to temporarily reduce the volume after a seek, + in order to avoid loud noises when scrubbing through a movie. + + The volume is linearly increased back up to its original level. + Repeated seeks before the transition is done work as well. + ''; + homepage = "https://github.com/CounterPillow/quack"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 8b9aadaccbc76..c75e810687132 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -1,6 +1,7 @@ { lib , buildLua , fetchFromGitHub +, gitUpdater , oscSupport ? false }: @@ -14,6 +15,9 @@ buildLua rec { rev = "v${version}"; hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; extraScripts = lib.optional oscSupport "quality-menu-osc.lua"; diff --git a/pkgs/applications/video/mpv/scripts/reload.nix b/pkgs/applications/video/mpv/scripts/reload.nix new file mode 100644 index 0000000000000..6f316e2f5d42a --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/reload.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, unstableGitUpdater +, buildLua }: + +buildLua rec { + pname = "mpv-reload"; + + version = "unstable-2023-12-19"; + src = fetchFromGitHub { + owner = "4e6"; + repo = pname; + rev = "133d596f6d369f320b4595bbed1f4a157b7b9ee5"; + hash = "sha256-B+4TCmf1T7MuwtbL+hGZoN1ktI31hnO5yayMG1zW8Ng="; + }; + passthru.updateScript = unstableGitUpdater {}; + + meta = { + description = "Manual & automatic reloading of videos"; + longDescription = '' + This script adds reloading of videos, automatically on timers (when stuck + buffering etc.) or manually on keybinds, to help with cases where a stream + is not loading further due to a network or remote issue. + ''; + homepage = "https://github.com/4e6/mpv-reload"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index b1f3f45956321..bf973c9206c71 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,5 +1,7 @@ { lib, buildLua -, fetchFromGitHub }: +, fetchFromGitHub +, gitUpdater +}: buildLua rec { pname = "simple-mpv-ui"; version = "3.0.0"; @@ -11,6 +13,9 @@ buildLua rec { hash = "sha256-I8lwpo3Hfpy3UnPMmHEJCdArVQnNL245NkxsYVmnMF0="; sparseCheckout = [ "main.lua" "webui-page" ]; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; scriptPath = "."; passthru.scriptName = "webui"; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix index f7f8049cbba33..841fc8eb9b4fb 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -1,6 +1,7 @@ { lib , buildLua , fetchFromGitea +, unstableGitUpdater , curl }: @@ -16,6 +17,7 @@ buildLua { rev = "ca2844b8cf7674bfccd282d389a50427742251d3"; hash = "sha256-28HWZ6nOhKiE+5Ya1N3Vscd8aeH9OKS0t72e/xPfFQQ="; }; + passthru.updateScript = unstableGitUpdater {}; preInstall = '' substituteInPlace sponsorblock_minimal.lua \ diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 3ddb701f6d1d4..7336fbe35dad8 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildLua, mpv-unwrapped }: +{ lib, fetchFromGitHub, unstableGitUpdater, buildLua, mpv-unwrapped }: buildLua { pname = "mpv-thumbfast"; @@ -10,6 +10,7 @@ buildLua { rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; + passthru.updateScript = unstableGitUpdater {}; passthru.extraWrapperArgs = [ "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index 4ed545363839c..40c4fa8776d84 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,4 +1,4 @@ -{ lib, buildLua, fetchFromGitHub, python3 }: +{ lib, buildLua, fetchFromGitHub, gitUpdater, python3 }: buildLua rec { pname = "mpv-thumbnail-script"; @@ -10,6 +10,7 @@ buildLua rec { rev = version; sha256 = "sha256-J24Rou7BTE7zoiPlBkWuO9dtYJiuzkuwB4FROuzXzag="; }; + passthru.updateScript = gitUpdater {}; nativeBuildInputs = [ python3 ]; postPatch = "patchShebangs concat_files.py"; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 4c434d49f368b..e5bb972a24181 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , fetchpatch +, gitUpdater , makeFontsConf , buildLua , buildGoModule @@ -17,6 +18,7 @@ buildLua (finalAttrs: { rev = finalAttrs.version; hash = "sha256-+4k8T1yX3IRXK3XkUShsuJSH9w1Zla7CaRENcIqX4iM="; }; + passthru.updateScript = gitUpdater {}; tools = buildGoModule { pname = "uosc-bin"; diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index dedc2c62e907e..bf412bdbf28f6 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + unstableGitUpdater, }: buildLua { pname = "visualizer"; @@ -13,6 +14,7 @@ buildLua { rev = "7dbbfb283508714b73ead2a57b6939da1d139bd3"; sha256 = "zzB4uBc1M2Gdr/JKY2uk8MY0hmQl1XeomkfTzuM45oE="; }; + passthru.updateScript = unstableGitUpdater {}; meta = with lib; { description = "various audio visualization"; diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix index 4c4aacef31dc7..9a7b335a6591d 100644 --- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, ffmpeg }: +{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater, ffmpeg }: stdenvNoCC.mkDerivation rec { pname = "vr-reversal"; @@ -10,6 +10,9 @@ stdenvNoCC.mkDerivation rec { rev = "v${version}"; sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; dontBuild = true; diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index e870818fc64fe..10fe3d0cdce03 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -1,4 +1,4 @@ -{ lib, buildNpmPackage, fetchFromGitHub, nodejs, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, gitUpdater, nodejs, python3 }: buildNpmPackage rec { pname = "webtorrent-mpv-hook"; @@ -10,6 +10,9 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-/dMtXcIyfAs++Zgz2CxRW0tkzn5QjS+WVGChlCyrU0U="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; postPatch = '' substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix index 94efde5003cfe..3fcc893b0d347 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-text-pthread"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-text-pthread"; rev = version; - sha256 = "sha256-HN8tSagxmk6FusDrp7d0fi15ardFgUCZBiYkeBqUI34="; + sha256 = "sha256-iwPoFbXkWzwE3smWJ+//ZUayD5OO/3iMSoYUTR3LVks="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b322563328944..f0bb04b8304fd 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -17,6 +17,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-UgZ58WLXq0U3EDt4311kv0kayVU17In4kwnQ+QN1E7A="; }; + patches = [ + # refresh Fedora tree URLs in virt-install-osinfo* expected XMLs + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/6e5c1db6b4a0af96afeb09a09fb2fc2b73308f01.patch"; + hash = "sha256-zivVo6nHvfB7aHadOouQZCBXn5rY12nxFjQ4FFwjgZI="; + }) + ]; + nativeBuildInputs = [ intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH @@ -77,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { ]; preCheck = '' - export HOME=. + export HOME=$(mktemp -d) ''; # <- Required for "tests/test_urldetect.py". postCheck = '' diff --git a/pkgs/by-name/bi/bitwarden-directory-connector-cli/package.nix b/pkgs/by-name/bi/bitwarden-directory-connector-cli/package.nix new file mode 100644 index 0000000000000..24376014a120a --- /dev/null +++ b/pkgs/by-name/bi/bitwarden-directory-connector-cli/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + buildPackages, + python3, + pkg-config, + libsecret, + nodejs_18, +}: +buildNpmPackage rec { + pname = "bitwarden-directory-connector-cli"; + version = "2023.10.0"; + nodejs = nodejs_18; + + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "directory-connector"; + rev = "v${version}"; + hash = "sha256-PlOtTh+rpTxAv8ajHBDHZuL7yeeLVpbAfKEDPQlejIg="; + }; + + postPatch = '' + ${lib.getExe buildPackages.jq} 'del(.scripts.preinstall)' package.json > package.json.tmp + mv -f package.json{.tmp,} + ''; + + npmDepsHash = "sha256-jBAWWY12qeX2EDhUvT3TQpnQvYXRsIilRrXGpVzxYvw="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + makeCacheWritable = true; + npmBuildScript = "build:cli:prod"; + + installPhase = '' + runHook preInstall + mkdir -p $out/libexec/bitwarden-directory-connector + cp -R {build-cli,node_modules} $out/libexec/bitwarden-directory-connector + runHook postInstall + ''; + + # needs to be wrapped with nodejs so that it can be executed + postInstall = '' + chmod +x $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js + mkdir -p $out/bin + ln -s $out/libexec/bitwarden-directory-connector/build-cli/bwdc.js $out/bin/bitwarden-directory-connector-cli + ''; + + buildInputs = [ + libsecret + ]; + + nativeBuildInputs = [ + python3 + pkg-config + ]; + + meta = with lib; { + description = "LDAP connector for Bitwarden"; + homepage = "https://github.com/bitwarden/directory-connector"; + license = licenses.gpl3Only; + maintainers = with maintainers; [Silver-Golden]; + platforms = platforms.linux; + mainProgram = "bitwarden-directory-connector-cli"; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 1687065fbd9b4..dcacc86071b14 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -17,20 +17,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-GgXnsPEUurPHrijf966x5ldp+1lDrgS1iBinU+EkdYU=b"; + hash = "sha256-Vf4UHN13eE9W4rekOEGAWIP3x79cVH3vI9sxuIscv8c="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-R5dEL4QbwCSE9+HHCXlf/pYLmjCaD15tmdSSLbZgmt0="; + npmDepsHash = "sha256-pfV9omdJiozJ9VotTImfM/DRsBPNGAEzmSdj3/C//4A="; nativeBuildInputs = [ (writeShellScriptBin "phantomjs" "echo 2.1.1") diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index f69c3f8e95d31..528323624805b 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication { pname = "memtree"; - version = "unstable-2023-11-22"; + version = "unstable-2024-01-04"; pyproject = true; src = fetchFromGitHub { owner = "nbraud"; repo = "memtree"; - rev = "edc09d91dcd72f175d6adc1d08b261dd95cc4fbf"; - hash = "sha256-YLZm0wjkjaTw/lHY5k4cqPXCgINe+49SGPLZq+eRdI4="; + rev = "97615952eabdc5e8e1a4bd590dd1f4971f3c5a24"; + hash = "sha256-Ifp8hwkuyBw57fGer3GbDiJaRjL4TD3hzj+ecGXWqI0="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix new file mode 100644 index 0000000000000..faacd2330d3f9 --- /dev/null +++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, libarchive +, openssl +, sqlite +, pkg-config +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "nixseparatedebuginfod"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "symphorien"; + repo = "nixseparatedebuginfod"; + rev = "v${version}"; + hash = "sha256-XSEHNoc3h21foVeR28KgfiBTRHyUh+GJ52LMD2xFHfA="; + }; + + cargoHash = "sha256-t6W6siHuga/T9kmanA735zH2i9eCOT7vD6v7E5LIp9k="; + + # tests need a working nix install with access to the internet + doCheck = false; + + buildInputs = [ + libarchive + openssl + sqlite + ]; + + nativeBuildInputs = [ pkg-config ]; + + passthru = { + tests = { + inherit (nixosTests) nixseparatedebuginfod; + }; + }; + + meta = with lib; { + description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed"; + homepage = "https://github.com/symphorien/nixseparatedebuginfod"; + license = licenses.gpl3Only; + maintainers = [ maintainers.symphorien ]; + platforms = platforms.linux; + mainProgram = "nixseparatedebuginfod"; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index a45f47bee6858..e9b32370af55c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "6a46f981138e6d012bfcced5f1d2b309b5452766", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a46f981138e6d012bfcced5f1d2b309b5452766.tar.gz", - "sha256": "1v297xyfv9nv1bji08gq8s6wrgmxjnhklvf6p0mvslyrj36w7mlj", - "msg": "Update from Hackage at 2023-12-04T17:35:08Z" + "commit": "d77837f979c4b15fe0eb25cdf8a0463773434c9d", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d77837f979c4b15fe0eb25cdf8a0463773434c9d.tar.gz", + "sha256": "01ihv1nwp0qqhwll5icl19ij5sb1nvhpnwgvwpcr319rn3b704km", + "msg": "Update from Hackage at 2023-12-17T16:07:47Z" } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index e563c21331870..6689902ed56f2 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20230308"; + version = "20231215"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-VGugTsxekzui1/PztDM6KYDUrk38UoSYm5xUdY8rkIg="; + hash = "sha256-37fFl1zk7//ZKq3QAJSg98WTtBmI/aU5kV9kWfcWRVQ="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index ea5a426f624a1..a60f42107ce43 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (self: { sourceRoot = "${self.src.name}/themes"; installPhase = '' runHook preInstall - install -Dt $out *.yaml + install -Dt $out *.toml runHook postInstall ''; diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5203941d06f1e..24ac471d6090c 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "45.2"; + version = "45.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-6es3CnlxtPhC+qME0xpIXb2P+K7EKnZScvL8GnqAmPI="; + hash = "sha256-Lxs6DZZC+MOwyyi3v1ZCgqwspdbE4MBe5gCy9EfxYCo="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 1cdfe82341300..0fab995beca83 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wX+GcExyKzbAGhaPHlFDm+C7J58sZkb0i2bp0POiTNI="; + sha256 = "sha256-2UzDnYLIDO5ygbgqzkLIIll2rV0MPvmVx+Aw9rqyIZw="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 900b02bc3df6b..871ee8dcaf08a 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "45.1"; + version = "45.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fJlO807NYOkV3jMe4SPAiTj5YjzvrabVC5njycWtgTU="; + sha256 = "eccUYL/+/M715nvj+1/KZXhT6CFstiY5nSuVDOAyDdw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 699f9961c11fd..1719127a6cbcf 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "45.0"; + version = "45.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "u03EaVDiqQ848jIlhIhW0qextxjInQKFzhl7cBa7Hcg="; + sha256 = "xiv+yYF+7luD6+kBqShhiaZ+tf8DPF3UFQZXT4Ir8JA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index f9994a0a7dbf8..34b3ac6098822 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "45.2"; + version = "45.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C92PwMrs1usBPGAQ28qTB3OXEYpu9eryZOKoIKKS9bc="; + sha256 = "1rkkWyIjfae9FzndKMI8yPODX5n6EMEDfZ3XY1M1JRw="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 277d00f19d619..a203e540555e6 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - sha256 = "C4yN7xjasFzEm9RkuQyn+UWuUv9eCSQtpwKhXZTT6N0="; + sha256 = "DC9TeBOxD3KEcNnQXWyVcT2yUS+clQluHoWxpnOWBeY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index ffd5573d01548..cf936f835ec0a 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "45.3"; + version = "45.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "27xURAbO54QRBBeOpKk742EH2dfsplVf0wGJzRQ41ko="; + sha256 = "edNZV6oWj0pWPmAW+5dQs1hlJgEkEVg4CkxLebdAAZ0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 78d757efee3c6..4363dc32c21e1 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -47,6 +47,7 @@ let inherit (bootGhcjs) version; isGhcjs = true; + llvmPackages = null; enableShared = true; socket-io = pkgsHostHost.nodePackages."socket.io"; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index d329664dddfad..cd517534d6498 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-11-02"; + version = "unstable-2024-01-04"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz"; - sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s"; + url = "https://github.com/NixOS/cabal2nix/archive/e394e96c51cc7a2858145e710fbedbb2cb57f6ec.tar.gz"; + sha256 = "0rzmyx2i2z3w2ibg4rbaasq0581sa7bf8n1cih6v3j6phzgl3058"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 850529f06bdfd..0feb4cb719d98 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -92,6 +92,15 @@ self: super: { guardian ; + # Extensions wants the latest version of Cabal for its list of Haskell + # language extensions. + extensions = super.extensions.override { + Cabal = + if versionOlder self.ghc.version "9.6" + then self.Cabal_3_10_2_1 + else null; # use GHC bundled version + }; + ####################################### ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### @@ -121,17 +130,6 @@ self: super: { # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); - # 2023-12-03: https://github.com/haskell/haskell-language-server/pull/3867 - hls-plugin-api = appendPatch (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch"; - relative = "hls-plugin-api"; - hash = "sha256-vlXPdEvmuIl+cM+u/GdHi8r72r4+Tqtsvx0CGbWEFCQ="; - }) (doJailbreak super.hls-plugin-api); - ghcide = appendPatch (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/1c884ea856cceeaa3254a2ef68c8ab3a3c353153.patch"; - relative = "ghcide"; - hash = "sha256-1URXyQf88v3hjFGvNmcIjHxJ5vExH3iI92XktDrQs0U="; - }) (doJailbreak super.ghcide); hls-test-utils = doJailbreak super.hls-test-utils; hls-alternate-number-format-plugin = doJailbreak super.hls-alternate-number-format-plugin; hls-cabal-plugin = doJailbreak super.hls-cabal-plugin; @@ -148,6 +146,12 @@ self: super: { # https://github.com/supki/ldap-client/issues/18 ldap-client-og = dontCheck super.ldap-client-og; + # Support for template-haskell >= 2.16 + language-haskell-extract = appendPatch (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; + }) (doJailbreak super.language-haskell-extract); + vector = overrideCabal (old: { # Too strict bounds on doctest which isn't used, but is part of the configuration jailbreak = true; @@ -189,6 +193,21 @@ self: super: { # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; + # Fixes the build if Cabal >= 3.10.2 is used for Setup.hs, as it got stricter + # about c- vs. cxx-sources: https://github.com/haskell/double-conversion/issues/43 + double-conversion = overrideCabal (drv: { + patches = drv.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "double-conversion-c-to-cxx-sources.patch"; + url = "https://github.com/haskell/double-conversion/pull/44/commits/d480fb057c5387251b8cfdeb3666b24087811219.patch"; + sha256 = "0jw2i2cybmv190bhab0afhz2v3zva2chazhmngh884fsq2p3j1cv"; + }) + ]; + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + }) super.double-conversion; + # Allow aeson == 2.1.* # https://github.com/hdgarrood/aeson-better-errors/issues/23 aeson-better-errors = doJailbreak super.aeson-better-errors; @@ -297,7 +316,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - patat = super.patat.override { pandoc = self.pandoc_3_1_9; }; + patat = super.patat.override { pandoc = self.pandoc_3_1_11; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -1239,22 +1258,22 @@ self: super: { # stack-2.13.1 requires a bunch of the latest packages. (drv: drv.overrideScope (hfinal: hprev: { - ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 - crypton = hprev.crypton_0_34; # needs crypton >= 0.33 + ansi-terminal = hfinal.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 + crypton = hfinal.crypton_0_34; # needs crypton >= 0.33 hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal - hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 - http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 - http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network - optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 - pantry = dontCheck hprev.pantry_0_9_3; # needs pantry >= 0.9.2, tests access network + hpack = hfinal.hpack_0_36_0; # needs hpack == 0.36.0 + http-client-tls = hfinal.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 + http-download = hfinal.http-download_0_2_1_0; # needs http-download >= 0.2.1.0 + optparse-applicative = hfinal.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 + pantry = hfinal.pantry_0_9_3_1; # needs pantry >= 0.9.2 syb = dontCheck hprev.syb; # cyclic dependencies - tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 + tar-conduit = hfinal.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 temporary = dontCheck hprev.temporary; # cyclic dependencies })) ]; hopenpgp-tools = super.hopenpgp-tools.override { - optparse-applicative = self.optparse-applicative_0_18_1_0; + optparse-applicative = self.optparse-applicative_0_18_1_0; }; # musl fixes @@ -1938,7 +1957,7 @@ self: super: { inherit (let pandoc-cli-overlay = self: super: { # pandoc-cli requires pandoc >= 3.1 - pandoc = self.pandoc_3_1_9; + pandoc = self.pandoc_3_1_11; # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. @@ -1947,17 +1966,26 @@ self: super: { # pandoc depends on skylighting >= 0.14 skylighting = self.skylighting_0_14_1; skylighting-core = self.skylighting-core_0_14_1; + + # pandoc needs up to date typst + typst-symbols = self.typst-symbols_0_1_5; + # and texmath to match + texmath = self.texmath_0_12_8_6; }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; - pandoc_3_1_9 = doDistribute (super.pandoc_3_1_9.overrideScope pandoc-cli-overlay); + pandoc_3_1_11 = doDistribute (super.pandoc_3_1_11.overrideScope pandoc-cli-overlay); pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay; }) pandoc-cli - pandoc_3_1_9 + pandoc_3_1_11 pandoc-lua-engine ; + # Doesn't work without typst-symbols >= 0.1.5 which conflicts with Stackage + # TODO(@sternenseemann): clean up with Stackage LTS 22 + typst = dontDistribute super.typst; + crypton-x509 = lib.pipe super.crypton-x509 @@ -2716,7 +2744,7 @@ self: super: { # 2023-12-20: Needs newer hasql-pool package and extra dependencies postgrest = lib.pipe (super.postgrest.overrideScope (lself: lsuper: { - hasql-pool = lself.hasql-pool_0_10; + hasql-pool = lself.hasql-pool_0_10_0_1; })) [ (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ]) # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 @@ -2762,13 +2790,19 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; - # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). - # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd - tomland = doJailbreak super.tomland; - - llvm-ffi = super.llvm-ffi.override { - LLVM = pkgs.llvmPackages_13.libllvm; - }; + tomland = overrideCabal (drv: { + # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). + # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd + jailbreak = true; + # Fix compilation of test suite with GHC >= 9.8 + patches = drv.patches or [ ] ++ [ + (pkgs.fetchpatch { + name = "tomland-disambiguate-string-type-for-ghc-9.8.patch"; + url = "https://github.com/kowainik/tomland/commit/0f107269b8835a8253f618b75930b11d3a3f1337.patch"; + sha256 = "13ndlfw32xh8jz5g6lpxzn2ks8zchb3y4j1jbbm2x279pdyvvars"; + }) + ]; + }) super.tomland; # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; 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 481db0d258fb5..8b4399af2076d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -8,7 +8,11 @@ in self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + # ghcjs does not use `llvmPackages` and exposes `null` attribute. + llvmPackages = + if self.ghc.llvmPackages != null + then pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages + else null; # Disable GHC 8.10.x core libraries. array = null; @@ -85,13 +89,6 @@ self: super: { shellmet = doJailbreak super.shellmet; shower = doJailbreak super.shower; - # Apply patch from https://github.com/finnsson/template-helper/issues/12#issuecomment-611795375 to fix the build. - language-haskell-extract = appendPatch (pkgs.fetchpatch { - name = "language-haskell-extract-0.2.4.patch"; - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/e48738ee1be774507887a90a0d67ad1319456afc/patches/language-haskell-extract-0.2.4.patch?inline=false"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; - }) (doJailbreak super.language-haskell-extract); - # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (overrideCabal (drv: { 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 c6b48129b6b43..d3b7d11ef93f8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -95,7 +95,7 @@ self: super: { ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = null; + exceptions = self.exceptions_0_10_7; # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin; 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 ad4e34dd2c69b..69eea055315af 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -68,10 +68,6 @@ self: super: { tuple = addBuildDepend self.base-orphans super.tuple; vector-th-unbox = doJailbreak super.vector-th-unbox; - hls-cabal-plugin = super.hls-cabal-plugin.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; - ormolu = self.ormolu_0_5_2_0.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; @@ -79,40 +75,11 @@ self: super: { stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; doctest = dontCheck super.doctest; - # Apply patches from head.hackage. - language-haskell-extract = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; - }) (doJailbreak super.language-haskell-extract); - - haskell-language-server = let - # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope` - additionalDeps = with self.haskell-language-server.scope; [ - (unmarkBroken hls-splice-plugin) - ]; - in addBuildDepends additionalDeps (disableCabalFlag "fourmolu" (super.haskell-language-server.overrideScope (lself: lsuper: { - # Needed for modern ormolu and fourmolu. - # Apply this here and not in common, because other ghc versions offer different Cabal versions. - Cabal = lself.Cabal_3_6_3_0; - hls-overloaded-record-dot-plugin = null; - hls-fourmolu-plugin = null; - }))); - - # Needs to use ghc-lib due to incompatible GHC - ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); - # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope` - hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ - ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers - ]) super.hls-haddock-comments-plugin); + haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"; - hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [ - aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide - hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec - parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers - ]) super.hls-tactics-plugin); + # Needs to use ghc-lib due to incompatible GHC + ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_6); # Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2 # https://github.com/ekmett/reflection/issues/51 @@ -130,10 +97,6 @@ self: super: { libraryHaskellDepends = old.libraryHaskellDepends ++ [self.ghc-api-compat]; }) super.hiedb; - # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206 - # Restrictive upper bound on ormolu - hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; - # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; @@ -162,10 +125,6 @@ self: super: { apply-refact = self.apply-refact_0_9_3_0; - hls-hlint-plugin = super.hls-hlint-plugin.override { - inherit (self) apply-refact; - }; - # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; 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 7f79e365417f7..5ffca6a50bc66 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -57,11 +57,12 @@ self: super: { # weeder >= 2.5 requires GHC 9.4 weeder = doDistribute self.weeder_2_4_1; - weeder_2_4_1 = super.weeder_2_4_1.override { + # Allow dhall 1.42.* + weeder_2_4_1 = doJailbreak (super.weeder_2_4_1.override { # weeder < 2.6 only supports algebraic-graphs < 0.7 # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; - }; + }); hls-cabal-plugin = super.hls-cabal-plugin.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; @@ -73,7 +74,11 @@ self: super: { stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; - haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { hls-fourmolu-plugin = null; }); + haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { + hls-fourmolu-plugin = null; + # Not buildable if GHC > 9.2.3, so we ship no compatible GHC + hls-stan-plugin = null; + }); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; @@ -86,12 +91,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # Apply patches from head.hackage. - language-haskell-extract = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; - }) (doJailbreak super.language-haskell-extract); - # Tests depend on `parseTime` which is no longer available hourglass = dontCheck super.hourglass; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 3c0b1d5aa0a04..f4daa4648d830 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -76,12 +76,6 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # Apply patches from head.hackage. - language-haskell-extract = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; - }) (doJailbreak super.language-haskell-extract); - # Tests depend on `parseTime` which is no longer available hourglass = dontCheck super.hourglass; @@ -122,9 +116,7 @@ in { in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { haskell-language-server = allowInconsistentDependencies super.haskell-language-server; - # Tests fail due to the newly-build fourmolu not being in PATH - # https://github.com/fourmolu/fourmolu/issues/231 - fourmolu = dontCheck super.fourmolu_0_14_0_0; + fourmolu = self.fourmolu_0_14_0_0; ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); hlint = super.hlint_3_6_1; stylish-haskell = super.stylish-haskell; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index d953c6ba3e56a..63029222cde44 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -95,9 +95,7 @@ self: super: { ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231121; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; - # Tests fail due to the newly-build fourmolu not being in PATH - # https://github.com/fourmolu/fourmolu/issues/231 - fourmolu = dontCheck super.fourmolu_0_14_0_0; + fourmolu = doDistribute self.fourmolu_0_14_0_0; ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); hlint = super.hlint_3_6_1; @@ -143,12 +141,6 @@ self: super: { # https://github.com/dreixel/syb/issues/40 syb = dontCheck super.syb; - # Support for template-haskell >= 2.16 - language-haskell-extract = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; - }) (doJailbreak super.language-haskell-extract); - # Patch 0.17.1 for support of mtl-2.3 xmonad-contrib = appendPatch (pkgs.fetchpatch { @@ -197,8 +189,8 @@ self: super: { hw-prim = dontCheck (doJailbreak super.hw-prim); stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; - rebase = doJailbreak super.rebase_1_20_1_1; - rerebase = doJailbreak super.rerebase_1_20_1_1; + rebase = doJailbreak super.rebase_1_20_2; + rerebase = doJailbreak super.rerebase_1_20_2; hiedb = dontCheck super.hiedb; retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 17f6415874f9c..d6672c22a2035 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -49,27 +49,71 @@ self: super: { unix = null; xhtml = null; - # https://github.com/tibbe/unordered-containers/issues/214 - unordered-containers = dontCheck super.unordered-containers; + # HLS + # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html + haskell-language-server = super.haskell-language-server.override { + hls-class-plugin = null; + hls-floskell-plugin = null; + hls-fourmolu-plugin = null; + hls-gadt-plugin = null; + hls-hlint-plugin = null; + hls-ormolu-plugin = null; + hls-refactor-plugin = null; + hls-rename-plugin = null; + hls-retrie-plugin = null; + hls-splice-plugin = null; + hls-stylish-haskell-plugin = null; + }; - # Test suite does not compile. - data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x - dates = doJailbreak super.dates; # base >=4.9 && <4.12 - Diff = dontCheck super.Diff; - HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 - hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 - http-api-data = doJailbreak super.http-api-data; - persistent-sqlite = dontCheck super.persistent-sqlite; - system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" - unicode-transforms = dontCheck super.unicode-transforms; - wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 - RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 - github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341 - binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33 + # Version upgrades + alex = doDistribute self.alex_3_4_0_1; + some = doDistribute self.some_1_0_6; + tagged = doDistribute self.tagged_0_8_8; + th-abstraction = doDistribute self.th-abstraction_0_6_0_0; + hspec-core = doDistribute self.hspec-core_2_11_7; + hspec-meta = doDistribute self.hspec-meta_2_11_7; + hspec-discover = doDistribute self.hspec-discover_2_11_7; + hspec = doDistribute self.hspec_2_11_7; + hspec-expectations = doDistribute self.hspec-expectations_0_8_4; + bifunctors = doDistribute self.bifunctors_5_6_1; + free = doDistribute self.free_5_2; + semigroupoids = doDistribute self.semigroupoids_6_0_0_1; + doctest = doDistribute self.doctest_0_22_2; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_1_20231121; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_0; + ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; + megaparsec = doDistribute self.megaparsec_9_6_1; + tasty-hspec = doDistribute self.tasty-hspec_1_2_0_4; + hedgehog = doDistribute self.hedgehog_1_4; + rebase = doDistribute self.rebase_1_20_2; + rerebase = doDistribute self.rerebase_1_20_2; + aeson = doDistribute self.aeson_2_2_1_0; + aeson-pretty = doDistribute self.aeson-pretty_0_8_10; + attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_0_1; + ormolu = doDistribute self.ormolu_0_7_3_0; + fourmolu = doDistribute (dontCheck self.fourmolu_0_14_1_0); - # https://github.com/jgm/skylighting/issues/55 - skylighting-core = dontCheck super.skylighting-core; + # Jailbreaks + commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19 + ghc-trace-events = doJailbreak super.ghc-trace-events; # text < 2.1, bytestring < 0.12, base < 4.19 + primitive-unlifted = doJailbreak super.primitive-unlifted; # bytestring < 0.12 + newtype-generics = doJailbreak super.newtype-generics; # base < 4.19 + hw-prim = doJailbreak super.hw-prim; # doctest < 0.22, ghc-prim < 0.11, hedgehog < 1.4 + hw-fingertree = doJailbreak super.hw-fingertree; # deepseq <1.5, doctest < 0.22, hedgehog < 1.4 + # Too strict bound on base, believe it or not. + # https://github.com/judah/terminfo/pull/55#issuecomment-1876894232 + terminfo_0_4_1_6 = doJailbreak super.terminfo_0_4_1_6; - # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 - stack = doJailbreak super.stack; + # Test suite issues + unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20 + lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.* + # https://github.com/wz1000/HieDb/issues/64 + hiedb = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "--match" "!/hiedb/Command line/point-info/correctly prints type signatures/" + ]; + }) super.hiedb; + + # Unbroken due to hspec* upgrades + hspec-api = doDistribute (unmarkBroken super.hspec-api); } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index c2cafa14a6745..d98107957e6ce 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -26,7 +26,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 - stm = doJailbreak self.stm_2_5_1_0; + stm = doJailbreak self.stm_2_5_3_0; exceptions = dontCheck self.exceptions_0_10_7; ## OTHER PACKAGES diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 71364c6a7476e..243c21b0d3b7d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -49,6 +49,7 @@ broken-packages: - acme-zero # failure in job https://hydra.nixos.org/build/233192937 at 2023-09-02 - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02 - acousticbrainz-client # failure in job https://hydra.nixos.org/build/233192638 at 2023-09-02 + - acquire # failure in job https://hydra.nixos.org/build/245695655 at 2024-01-07 - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02 - ActionKid # failure in job https://hydra.nixos.org/build/234443624 at 2023-09-13 - activehs-base # failure in job https://hydra.nixos.org/build/233254736 at 2023-09-02 @@ -81,6 +82,7 @@ broken-packages: - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 - aeson-gadt-th # failure in job https://hydra.nixos.org/build/233247060 at 2023-09-02 + - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 - aeson-lens # failure in job https://hydra.nixos.org/build/233235357 at 2023-09-02 @@ -548,7 +550,6 @@ broken-packages: - bytepatch # failure in job https://hydra.nixos.org/build/236678340 at 2023-10-04 - bytestring-arbitrary # failure in job https://hydra.nixos.org/build/233195013 at 2023-09-02 - bytestring-class # failure in job https://hydra.nixos.org/build/233230793 at 2023-09-02 - - bytestring-conversion # failure in job https://hydra.nixos.org/build/233211464 at 2023-09-02 - bytestring-csv # failure in job https://hydra.nixos.org/build/233215194 at 2023-09-02 - bytestring-delta # failure in job https://hydra.nixos.org/build/233207977 at 2023-09-02 - bytestring-handle # failure in job https://hydra.nixos.org/build/233192234 at 2023-09-02 @@ -613,7 +614,6 @@ broken-packages: - cacophony # failure in job https://hydra.nixos.org/build/233239380 at 2023-09-02 - cafeteria-prelude # failure in job https://hydra.nixos.org/build/233254881 at 2023-09-02 - cairo-core # failure in job https://hydra.nixos.org/build/233248151 at 2023-09-02 - - cairo-image # failure in job https://hydra.nixos.org/build/243813080 at 2024-01-01 - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02 - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02 - calamity # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238601583 at 2023-10-21 @@ -828,6 +828,7 @@ broken-packages: - Command # failure in job https://hydra.nixos.org/build/233249718 at 2023-09-02 - Commando # failure in job https://hydra.nixos.org/build/233248911 at 2023-09-02 - commodities # failure in job https://hydra.nixos.org/build/233239851 at 2023-09-02 + - commonmark-simple # failure in job https://hydra.nixos.org/build/245703574 at 2024-01-07 - Compactable # failure in job https://hydra.nixos.org/build/233227285 at 2023-09-02 - compactable # failure in job https://hydra.nixos.org/build/233228106 at 2023-09-02 - compact-list # failure in job https://hydra.nixos.org/build/233241961 at 2023-09-02 @@ -848,6 +849,7 @@ broken-packages: - compose-trans # failure in job https://hydra.nixos.org/build/233236785 at 2023-09-02 - composite-aeson-path # failure in job https://hydra.nixos.org/build/233203114 at 2023-09-02 - composite-aeson-refined # failure in job https://hydra.nixos.org/build/233241450 at 2023-09-02 + - composite-base # failure in job https://hydra.nixos.org/build/245710306 at 2024-01-07 - composite-cassava # failure in job https://hydra.nixos.org/build/233241110 at 2023-09-02 - composite-dhall # failure in job https://hydra.nixos.org/build/244399630 at 2024-01-01 - composite-ekg # failure in job https://hydra.nixos.org/build/233235858 at 2023-09-02 @@ -1151,6 +1153,7 @@ broken-packages: - deepseq-magic # failure in job https://hydra.nixos.org/build/233228993 at 2023-09-02 - deepseq-th # failure in job https://hydra.nixos.org/build/233233106 at 2023-09-02 - definitive-base # failure in job https://hydra.nixos.org/build/233255489 at 2023-09-02 + - defun-bool # failure in job https://hydra.nixos.org/build/245696015 at 2024-01-07 - deiko-config # failure in job https://hydra.nixos.org/build/233210895 at 2023-09-02 - deka # failure in job https://hydra.nixos.org/build/233206540 at 2023-09-02 - Delta-Lambda # failure in job https://hydra.nixos.org/build/233239406 at 2023-09-02 @@ -1513,7 +1516,6 @@ broken-packages: - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02 - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02 - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 - - extensions # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239249292 at 2023-11-10 - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02 - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02 - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21 @@ -2268,6 +2270,7 @@ broken-packages: - hcoap # failure in job https://hydra.nixos.org/build/233233393 at 2023-09-02 - hcobs # failure in job https://hydra.nixos.org/build/233230173 at 2023-09-02 - hcom # failure in job https://hydra.nixos.org/build/233201664 at 2023-09-02 + - hcount # failure in job https://hydra.nixos.org/build/245788445 at 2024-01-07 - hcron # failure in job https://hydra.nixos.org/build/233235518 at 2023-09-02 - hCsound # failure in job https://hydra.nixos.org/build/233254871 at 2023-09-02 - hdaemonize-buildfix # failure in job https://hydra.nixos.org/build/233225678 at 2023-09-02 @@ -2439,7 +2442,6 @@ broken-packages: - hls-haddock-comments-plugin # failure in job https://hydra.nixos.org/build/233233944 at 2023-09-02 - hls-refine-imports-plugin # failure in job https://hydra.nixos.org/build/233211155 at 2023-09-02 - hls-selection-range-plugin # failure in job https://hydra.nixos.org/build/233205582 at 2023-09-02 - - hls-stan-plugin # failure in job https://hydra.nixos.org/build/233246900 at 2023-09-02 - hls-tactics-plugin # failure in job https://hydra.nixos.org/build/233238907 at 2023-09-02 - hlwm # failure in job https://hydra.nixos.org/build/233235119 at 2023-09-02 - hly # failure in job https://hydra.nixos.org/build/233206910 at 2023-09-02 @@ -2900,7 +2902,6 @@ broken-packages: - ip-quoter # failure in job https://hydra.nixos.org/build/233234581 at 2023-09-02 - iptables-helpers # failure in job https://hydra.nixos.org/build/233198949 at 2023-09-02 - IPv6DB # failure in job https://hydra.nixos.org/build/233199983 at 2023-09-02 - - ircbot # failure in job https://hydra.nixos.org/build/233237219 at 2023-09-02 - irc-core # failure in job https://hydra.nixos.org/build/233242138 at 2023-09-02 - irc-dcc # failure in job https://hydra.nixos.org/build/233230181 at 2023-09-02 - Irc # failure in job https://hydra.nixos.org/build/233230852 at 2023-09-02 @@ -3249,6 +3250,7 @@ broken-packages: - linkedhashmap # failure in job https://hydra.nixos.org/build/233234634 at 2023-09-02 - linked-list-with-iterator # failure in job https://hydra.nixos.org/build/233220466 at 2023-09-02 - linklater # failure in job https://hydra.nixos.org/build/233220508 at 2023-09-02 + - linnet # failure in job https://hydra.nixos.org/build/245788523 at 2024-01-07 - linode # failure in job https://hydra.nixos.org/build/233256512 at 2023-09-02 - linode-v4 # failure in job https://hydra.nixos.org/build/233238195 at 2023-09-02 - linux-blkid # failure in job https://hydra.nixos.org/build/233220151 at 2023-09-02 @@ -3281,7 +3283,6 @@ broken-packages: - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02 - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02 - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 - - llvm-ffi # failure in job https://hydra.nixos.org/build/237230725 at 2023-10-21 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02 @@ -3983,6 +3984,7 @@ broken-packages: - padic # failure in job https://hydra.nixos.org/build/233244747 at 2023-09-02 - pads-haskell # failure in job https://hydra.nixos.org/build/233224030 at 2023-09-02 - pagarme # failure in job https://hydra.nixos.org/build/233201914 at 2023-09-02 + - pagerduty # failure in job https://hydra.nixos.org/build/245788462 at 2024-01-07 - pagerduty-hs # failure in job https://hydra.nixos.org/build/233220387 at 2023-09-02 - pagure-hook-receiver # failure in job https://hydra.nixos.org/build/233245894 at 2023-09-02 - PandocAgda # failure in job https://hydra.nixos.org/build/233332745 at 2023-09-02 @@ -4680,6 +4682,7 @@ broken-packages: - resource-effect # failure in job https://hydra.nixos.org/build/233253816 at 2023-09-02 - resource-embed # failure in job https://hydra.nixos.org/build/233209109 at 2023-09-02 - resource-pool-monad # failure in job https://hydra.nixos.org/build/233204199 at 2023-09-02 + - resourcet-extra # failure in job https://hydra.nixos.org/build/245696134 at 2024-01-07 - resourcet-pool # failure in job https://hydra.nixos.org/build/233213894 at 2023-09-02 - restartable # failure in job https://hydra.nixos.org/build/233220815 at 2023-09-02 - restyle # failure in job https://hydra.nixos.org/build/233199043 at 2023-09-02 @@ -4742,6 +4745,7 @@ broken-packages: - rpm # failure in job https://hydra.nixos.org/build/233194513 at 2023-09-02 - rpmostree-update # failure in job https://hydra.nixos.org/build/233254709 at 2023-09-02 - rrule # failure in job https://hydra.nixos.org/build/233259470 at 2023-09-02 + - rsi-break # failure in job https://hydra.nixos.org/build/245788743 at 2024-01-07 - rspp # failure in job https://hydra.nixos.org/build/233236691 at 2023-09-02 - rss2irc # failure in job https://hydra.nixos.org/build/233196081 at 2023-09-02 - rstream # failure in job https://hydra.nixos.org/build/233249587 at 2023-09-02 @@ -4901,6 +4905,7 @@ broken-packages: - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02 - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02 - servant-kotlin # failure in job https://hydra.nixos.org/build/233598190 at 2023-09-02 + - servant-mock # failure in job https://hydra.nixos.org/build/245788431 at 2024-01-07 - servant-namedargs # failure in job https://hydra.nixos.org/build/233258674 at 2023-09-02 - servant-nix # failure in job https://hydra.nixos.org/build/233236159 at 2023-09-02 - servant-pandoc # failure in job https://hydra.nixos.org/build/233203008 at 2023-09-02 @@ -4955,6 +4960,7 @@ broken-packages: - shake-cabal-build # failure in job https://hydra.nixos.org/build/233192322 at 2023-09-02 - shake-dhall # failure in job https://hydra.nixos.org/build/233246191 at 2023-09-02 - shake-extras # failure in job https://hydra.nixos.org/build/233192079 at 2023-09-02 + - shake-futhark # failure in job https://hydra.nixos.org/build/245711571 at 2024-01-07 - shake-minify # failure in job https://hydra.nixos.org/build/233251572 at 2023-09-02 - shake-pack # failure in job https://hydra.nixos.org/build/233195211 at 2023-09-02 - shake-path # failure in job https://hydra.nixos.org/build/233247617 at 2023-09-02 @@ -5010,6 +5016,7 @@ broken-packages: - simple-money # failure in job https://hydra.nixos.org/build/233240744 at 2023-09-02 - simple-neural-networks # failure in job https://hydra.nixos.org/build/233226975 at 2023-09-02 - simplenote # failure in job https://hydra.nixos.org/build/233225953 at 2023-09-02 + - simple-pango # failure in job https://hydra.nixos.org/build/245788400 at 2024-01-07 - simple-parser # failure in job https://hydra.nixos.org/build/233218275 at 2023-09-02 - simple-pipe # failure in job https://hydra.nixos.org/build/233251483 at 2023-09-02 - simpleprelude # failure in job https://hydra.nixos.org/build/233259585 at 2023-09-02 @@ -5196,7 +5203,6 @@ broken-packages: - staged-gg # failure in job https://hydra.nixos.org/build/233252183 at 2023-09-02 - standalone-derive-topdown # failure in job https://hydra.nixos.org/build/233252467 at 2023-09-02 - standalone-haddock # failure in job https://hydra.nixos.org/build/233254339 at 2023-09-02 - - stan # failure in job https://hydra.nixos.org/build/233200000 at 2023-09-02 - starling # failure in job https://hydra.nixos.org/build/233255468 at 2023-09-02 - starter # failure in job https://hydra.nixos.org/build/233208799 at 2023-09-02 - starter-snake-haskell # failure in job https://hydra.nixos.org/build/236685019 at 2023-10-04 @@ -5835,6 +5841,7 @@ broken-packages: - uu-cco # failure in job https://hydra.nixos.org/build/233259027 at 2023-09-02 - uuid-aeson # failure in job https://hydra.nixos.org/build/233219695 at 2023-09-02 - uusi # failure in job https://hydra.nixos.org/build/233201662 at 2023-09-02 + - uu-tc-error # failure in job https://hydra.nixos.org/build/245696966 at 2024-01-07 - uvector # failure in job https://hydra.nixos.org/build/233224782 at 2023-09-02 - uxadt # failure in job https://hydra.nixos.org/build/233254972 at 2023-09-02 - vabal-lib # failure in job https://hydra.nixos.org/build/233198776 at 2023-09-02 @@ -5941,6 +5948,7 @@ broken-packages: - wai-middleware-preprocessor # failure in job https://hydra.nixos.org/build/233227365 at 2023-09-02 - wai-middleware-static-caching # failure in job https://hydra.nixos.org/build/233208386 at 2023-09-02 - wai-middleware-travisci # failure in job https://hydra.nixos.org/build/233215805 at 2023-09-02 + - wai-predicates # failure in job https://hydra.nixos.org/build/245788559 at 2024-01-07 - wai-problem-details # failure in job https://hydra.nixos.org/build/233227727 at 2023-09-02 - wai-rate-limit-postgres # failure in job https://hydra.nixos.org/build/233244097 at 2023-09-02 - wai-rate-limit-redis # failure in job https://hydra.nixos.org/build/233207860 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 47ac2ef1e56d7..f8957475256f6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,8 +77,6 @@ extra-packages: - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - - dhall == 1.29.0 # required for ats-pkg - - dhall == 1.38.1 # required for spago - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 @@ -128,7 +126,6 @@ extra-packages: - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer @@ -521,6 +518,7 @@ package-maintainers: - latex - lazyio - linear-programming + - llvm-ffi - markov-chain - midi - midi-alsa diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e97e525ba7deb..64484da354493 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 21.23 +# Stackage LTS 21.25 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -10,12 +10,12 @@ default-package-overrides: - ace ==0.6 - acid-state ==0.16.1.3 - action-permutations ==0.0.0.1 - - active ==0.2.0.18 + - active ==0.2.1 - ad ==4.5.4 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - - advent-of-code-api ==0.2.8.4 + - advent-of-code-api ==0.2.9.1 - aern2-mp ==0.2.15.1 - aern2-real ==0.2.15 - aeson ==2.1.2.1 @@ -31,8 +31,8 @@ default-package-overrides: - aeson-pretty ==0.8.9 - aeson-qq ==0.8.4 - aeson-schemas ==1.4.1.0 - - aeson-typescript ==0.6.0.0 - - aeson-value-parser ==0.19.7.1 + - aeson-typescript ==0.6.1.0 + - aeson-value-parser ==0.19.7.2 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.1 - agda2lagda ==0.2023.6.9 @@ -46,7 +46,7 @@ default-package-overrides: - Allure ==0.11.0.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - - alsa-mixer ==0.3.0 + - alsa-mixer ==0.3.0.1 - alsa-pcm ==0.6.1.1 - alsa-seq ==0.6.0.9 - alternative-vector ==0.0.0 @@ -107,13 +107,13 @@ default-package-overrides: - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - - attoparsec-data ==1.0.5.3 + - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - attoparsec-framer ==0.1.0.1 - attoparsec-iso8601 ==1.1.0.0 - attoparsec-path ==0.0.0.1 - attoparsec-run ==0.0.2.0 - - attoparsec-time ==1.0.3 + - attoparsec-time ==1.0.3.1 - audacity ==0.0.2.1 - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 @@ -182,7 +182,7 @@ default-package-overrides: - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - binary-orphans ==1.0.4.1 - - binary-parser ==0.5.7.4 + - binary-parser ==0.5.7.5 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -231,7 +231,7 @@ default-package-overrides: - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.2.0 + - box ==0.9.2.1 - boxes ==0.1.5 - breakpoint ==0.1.2.2 - brick ==1.9 @@ -260,7 +260,7 @@ default-package-overrides: - byteorder ==1.0.4 - bytes ==0.17.3 - byteset ==0.1.1.1 - - byteslice ==0.2.11.1 + - byteslice ==0.2.12.0 - bytesmith ==0.3.10.0 - bytestring-builder ==0.10.8.2.0 - bytestring-lexing ==0.5.0.11 @@ -287,7 +287,7 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-alloy ==0.4.0.3 - calligraphy ==0.1.6 - - call-plantuml ==0.0.1.2 + - call-plantuml ==0.0.1.3 - call-stack ==0.4.0 - can-i-haz ==0.3.1.1 - capability ==0.5.0.1 @@ -311,7 +311,7 @@ default-package-overrides: - cereal ==0.5.8.3 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 - - cereal-unordered-containers ==0.1 + - cereal-unordered-containers ==0.1.0.1 - cereal-vector ==0.2.0.1 - cfenv ==0.1.0.0 - cgi ==3001.5.0.1 @@ -371,9 +371,9 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.4 - - commonmark-extensions ==0.2.4 - - commonmark-pandoc ==0.2.1.3 + - commonmark ==0.2.4.1 + - commonmark-extensions ==0.2.5.1 + - commonmark-pandoc ==0.2.2 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.1 - comonad ==5.0.8 @@ -394,7 +394,7 @@ default-package-overrides: - concurrent-output ==1.10.20 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - - conduino ==0.2.2.0 + - conduino ==0.2.4.0 - conduit ==1.3.5 - conduit-aeson ==0.1.0.1 - conduit-algorithms ==0.0.13.0 @@ -416,7 +416,7 @@ default-package-overrides: - constraints ==0.13.4 - constraints-extras ==0.4.0.0 - constraint-tuples ==0.1.2 - - context ==0.2.0.2 + - context ==0.2.0.3 - context-http-client ==0.2.0.2 - context-resource ==0.2.0.2 - context-wai-middleware ==0.2.0.2 @@ -546,7 +546,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.5 + - deferred-folds ==0.9.18.6 - dejafu ==2.4.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -579,7 +579,7 @@ default-package-overrides: - di-df1 ==1.2.1 - Diff ==0.4.1 - diff-loc ==0.1.0.0 - - digest ==0.0.1.7 + - digest ==0.0.2.0 - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 @@ -613,11 +613,11 @@ default-package-overrides: - doctest-parallel ==0.3.1 - doldol ==0.4.1.2 - do-list ==1.0.1 - - domain ==0.1.1.4 - - domain-aeson ==0.1.1.1 - - domain-cereal ==0.1 - - domain-core ==0.1.0.3 - - domain-optics ==0.1.0.3 + - domain ==0.1.1.5 + - domain-aeson ==0.1.1.2 + - domain-cereal ==0.1.0.1 + - domain-core ==0.1.0.4 + - domain-optics ==0.1.0.4 - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.11.0.2 @@ -662,7 +662,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.31 - eliminators ==0.9.2 - - elm2nix ==0.3.0 + - elm2nix ==0.3.1 - elm-bridge ==0.8.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 @@ -799,7 +799,7 @@ default-package-overrides: - foreign-store ==0.2 - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - - formatn ==0.3.0 + - formatn ==0.3.0.1 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -963,7 +963,7 @@ default-package-overrides: - graphql-client ==1.2.2 - graphs ==0.7.2 - graphula ==2.0.2.2 - - graphviz ==2999.20.1.0 + - graphviz ==2999.20.2.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.1 - gridtables ==0.1.0.0 @@ -982,7 +982,7 @@ default-package-overrides: - haddock-library ==1.11.0 - haha ==0.3.1.1 - hakyll ==4.16.2.0 - - hal ==1.0.0.1 + - hal ==1.0.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamlet ==1.2.0 @@ -997,7 +997,7 @@ default-package-overrides: - happy-meta ==0.2.1.0 - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - - hasbolt ==0.1.6.3 + - hasbolt ==0.1.7.0 - hashable ==1.4.3.0 - hashing ==0.1.1.0 - hashmap ==1.3.3 @@ -1027,7 +1027,7 @@ default-package-overrides: - hasql-optparse-applicative ==0.7 - hasql-pool ==0.9.0.1 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.18 + - hasql-th ==0.4.0.19 - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1038,7 +1038,7 @@ default-package-overrides: - hdaemonize ==0.5.7 - HDBC ==2.4.0.4 - HDBC-session ==0.1.2.1 - - headed-megaparsec ==0.2.1.2 + - headed-megaparsec ==0.2.1.3 - heap ==1.0.4 - heaps ==0.4 - heatshrink ==0.1.0.0 @@ -1208,7 +1208,7 @@ default-package-overrides: - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.0.1 + - http-reverse-proxy ==0.6.0.2 - http-streams ==0.8.9.9 - http-types ==0.12.4 - human-readable-duration ==0.2.1.4 @@ -1321,7 +1321,7 @@ default-package-overrides: - IPv6Addr ==2.0.5.1 - ipynb ==0.2 - ipython-kernel ==0.10.3.0 - - irc ==0.6.1.0 + - irc ==0.6.1.1 - irc-ctcp ==0.1.3.1 - isbn ==1.1.0.4 - islink ==0.1.0.0 @@ -1329,7 +1329,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.11 + - isomorphism-class ==0.1.0.12 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1445,7 +1445,7 @@ default-package-overrides: - linear-base ==0.3.1 - linear-circuit ==0.1.0.4 - linear-generics ==0.2.1 - - linear-programming ==0.0 + - linear-programming ==0.0.0.1 - linebreak ==1.1.0.4 - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.0 @@ -1593,7 +1593,7 @@ default-package-overrides: - monadlist ==0.0.2 - monadloc ==0.7.1 - monad-logger ==0.3.40 - - monad-logger-aeson ==0.4.1.1 + - monad-logger-aeson ==0.4.1.2 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-loops ==0.4.3 @@ -1709,7 +1709,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.5 - non-empty ==0.3.5 - - nonempty-containers ==0.3.4.4 + - nonempty-containers ==0.3.4.5 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.3 @@ -1720,7 +1720,7 @@ default-package-overrides: - nothunks ==0.1.5 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - - nqe ==0.6.4 + - nqe ==0.6.5 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1742,7 +1742,7 @@ default-package-overrides: - ofx ==0.4.4.0 - oidc-client ==0.7.0.1 - old-locale ==1.0.0.7 - - old-time ==1.1.0.3 + - old-time ==1.1.0.4 - once ==0.4 - one-liner ==2.1 - one-liner-instances ==0.1.3.0 @@ -1774,7 +1774,7 @@ default-package-overrides: - optics-operators ==0.1.0.1 - optics-th ==0.4.1 - optics-vl ==0.2.1 - - optima ==0.4.0.4 + - optima ==0.4.0.5 - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.17.1.0 @@ -1856,13 +1856,13 @@ default-package-overrides: - persistent-lens ==1.0.0 - persistent-mongoDB ==2.13.0.1 - persistent-mtl ==0.5.0.1 - - persistent-mysql ==2.13.1.4 + - persistent-mysql ==2.13.1.5 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.13.6.1 - persistent-qq ==2.12.0.6 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 - - persistent-sqlite ==2.13.2.0 + - persistent-sqlite ==2.13.3.0 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 @@ -1917,14 +1917,14 @@ default-package-overrides: - posix-pty ==0.2.2 - possibly ==1.0.0.0 - postgres-options ==0.2.1.0 - - postgresql-binary ==0.13.1.1 + - postgresql-binary ==0.13.1.2 - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.7 - postgresql-schema ==0.1.14 - postgresql-simple ==0.6.5.1 - postgresql-simple-url ==0.2.1.0 - - postgresql-syntax ==0.4.1 + - postgresql-syntax ==0.4.1.1 - postgresql-typed ==0.6.2.2 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 @@ -1984,7 +1984,7 @@ default-package-overrides: - psqueues ==0.2.8.0 - pthread ==0.2.1 - ptr ==0.16.8.5 - - ptr-poker ==0.1.2.13 + - ptr-poker ==0.1.2.14 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 @@ -2144,7 +2144,7 @@ default-package-overrides: - s3-signer ==0.5.0.0 - safe ==0.3.19 - safe-coloured-text ==0.2.0.1 - - safe-coloured-text-gen ==0.0.0.1 + - safe-coloured-text-gen ==0.0.0.2 - safe-coloured-text-layout ==0.0.0.0 - safe-coloured-text-layout-gen ==0.0.0.0 - safe-coloured-text-terminfo ==0.1.0.0 @@ -2172,8 +2172,8 @@ default-package-overrides: - say ==0.1.0.1 - sbp ==4.15.0 - sbv ==10.2 - - scalpel ==0.6.2.1 - - scalpel-core ==0.6.2.1 + - scalpel ==0.6.2.2 + - scalpel-core ==0.6.2.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==2.0.0.1 @@ -2199,7 +2199,7 @@ default-package-overrides: - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - - sendfile ==0.7.11.4 + - sendfile ==0.7.11.5 - sendgrid-v3 ==1.0.0.1 - seqalign ==0.2.0.4 - seqid ==0.6.3 @@ -2577,7 +2577,7 @@ default-package-overrides: - these-optics ==1.0.1.2 - these-skinny ==0.7.5 - th-expand-syns ==0.4.11.0 - - th-lego ==0.3.0.2 + - th-lego ==0.3.0.3 - th-lift ==0.8.4 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 @@ -2595,7 +2595,7 @@ default-package-overrides: - th-utilities ==0.2.5.0 - thyme ==0.4 - tidal ==1.9.4 - - tidal-link ==1.0.1 + - tidal-link ==1.0.2 - tile ==0.3.0.0 - time-compat ==1.9.6.1 - time-domain ==0.1.0.2 @@ -2724,7 +2724,7 @@ default-package-overrides: - universe-some ==1.2.1 - universum ==1.8.2 - unix-bytestring ==0.4.0 - - unix-compat ==0.7 + - unix-compat ==0.7.1 - unix-time ==0.4.11 - unjson ==0.15.4 - unliftio ==0.2.25.0 @@ -2772,10 +2772,10 @@ default-package-overrides: - vector-algorithms ==0.9.0.1 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.4 + - vector-builder ==0.3.8.5 - vector-bytes-instances ==0.1.1 - vector-extras ==0.2.8.1 - - vector-hashtables ==0.1.1.3 + - vector-hashtables ==0.1.1.4 - vector-instances ==3.4.2 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.2 @@ -2796,7 +2796,7 @@ default-package-overrides: - vivid-supercollider ==0.4.1.2 - void ==0.7.3 - vty ==5.38 - - wai ==3.2.3 + - wai ==3.2.4 - wai-app-static ==3.1.8 - wai-cli ==0.2.3 - wai-conduit ==3.0.0.4 @@ -2913,8 +2913,8 @@ default-package-overrides: - xss-sanitize ==0.3.7.2 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - - yaml-unscrambler ==0.1.0.17 - - Yampa ==0.14.5 + - yaml-unscrambler ==0.1.0.18 + - Yampa ==0.14.6 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index cc084eb63cfd6..6b9bf78a40d04 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -806,6 +806,7 @@ dont-distribute-packages: - chart-svg - chart-svg-various - chart-unit + - chassis - cheapskate-highlight - cheapskate-lucid - cheapskate-terminal @@ -911,7 +912,20 @@ dont-distribute-packages: - comonad-random - compaREST - compact-mutable + - compdoc + - compdoc-dhall-decoder - complexity + - composite-aeson + - composite-aeson-cofree-list + - composite-aeson-throw + - composite-aeson-writeonly + - composite-binary + - composite-hashable + - composite-ix + - composite-lens-extra + - composite-tuple + - composite-xml + - composite-xstep - comprehensions-ghc - computational-algebra - concraft @@ -1071,6 +1085,7 @@ dont-distribute-packages: - definitive-parser - definitive-reactive - definitive-sound + - defun - deka-tests - delaunay - delicious @@ -1983,7 +1998,6 @@ dont-distribute-packages: - hcg-minus-cairo - hcheat - hcheckers - - hcount - hcube - hdbi - hdbi-conduit @@ -2161,6 +2175,7 @@ dont-distribute-packages: - hslogstash - hsparql - hspec-expectations-pretty + - hspec-formatter-github - hspec-pg-transact - hspec-setup - hspec-shouldbe @@ -2242,6 +2257,7 @@ dont-distribute-packages: - hyena - hylotab - hyloutils + - hyperbole - hyperpublic - i - iException @@ -2529,7 +2545,6 @@ dont-distribute-packages: - linearscan-hoopl - linkchk - linkcore - - linnet - linnet-aeson - linnet-conduit - linux-ptrace @@ -2715,6 +2730,8 @@ dont-distribute-packages: - modular-prelude-classy - modularity - modulo + - moffy-samples-gtk4 + - moffy-samples-gtk4-run - mole - monad-exception - monad-http @@ -2745,7 +2762,6 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp - mptcp-pm - mptcpanalyzer - msgpack-aeson @@ -2947,7 +2963,6 @@ dont-distribute-packages: - overload - package-o-tron - padKONTROL - - pagerduty - pairing - panda - pandoc-highlighting-extensions @@ -3229,7 +3244,6 @@ dont-distribute-packages: - quiver-interleave - quiver-sort - qux - - rabocsv2qif - rail-compiler-editor - rails-session - rainbow-tests @@ -3281,7 +3295,6 @@ dont-distribute-packages: - redHandlers - reddit - redis-io - - redis-resp - rediscaching-haxl - reduce-equations - refh @@ -3524,6 +3537,7 @@ dont-distribute-packages: - serpentine - serv - serv-wai + - servant-aeson-generics-typescript - servant-auth-hmac - servant-auth-token - servant-auth-token-acid @@ -3540,7 +3554,6 @@ dont-distribute-packages: - servant-haxl-client - servant-http2-client - servant-matrix-param - - servant-mock - servant-oauth2 - servant-oauth2-examples - servant-openapi3 @@ -3596,12 +3609,10 @@ dont-distribute-packages: - silvi - simgi - simple-c-value - - simple-cairo - simple-firewire - simple-log-syslog - simple-logging - simple-nix - - simple-pango - simple-pascal - simple-postgresql-orm - simpleirc-lens @@ -4127,7 +4138,6 @@ dont-distribute-packages: - wai-middleware-route - wai-middleware-validation - wai-middleware-verbs - - wai-predicates - wai-route - wai-routing - wai-session-alt @@ -4157,7 +4167,6 @@ dont-distribute-packages: - webcrank-wai - webdriver-w3c - webgear-openapi - - webgear-server - webify - webserver - websockets-rpc diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cecd27e023da1..8b40842fd0d70 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -114,6 +114,7 @@ self: super: builtins.intersectAttrs super { })) super) hls-brittany-plugin + hls-stan-plugin hls-floskell-plugin hls-fourmolu-plugin hls-overloaded-record-dot-plugin @@ -328,6 +329,11 @@ self: super: builtins.intersectAttrs super { # Heist's test suite requires system pandoc heist = addTestToolDepend pkgs.pandoc super.heist; + # Use Nixpkgs' double-conversion library + double-conversion = disableCabalFlag "embedded_double_conversion" ( + addBuildDepends [ pkgs.double-conversion ] super.double-conversion + ); + # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = lib.pipe super.gio [ (disableHardening ["fortify"]) @@ -422,7 +428,7 @@ self: super: builtins.intersectAttrs super { hasql-interpolate = dontCheck super.hasql-interpolate; hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; - hasql-pool_0_10 = dontCheck super.hasql-pool_0_10; + hasql-pool_0_10_0_1 = doDistribute (dontCheck super.hasql-pool_0_10_0_1); hasql-transaction = dontCheck super.hasql-transaction; # Test suite requires a running postgresql server, @@ -447,9 +453,8 @@ self: super: builtins.intersectAttrs super { mime-mail = appendConfigureFlag "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"" super.mime-mail; # Help the test suite find system timezone data. - tz = overrideCabal (drv: { - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - }) super.tz; + tz = addBuildDepends [ pkgs.tzdata ] super.tz; + tzdata = addBuildDepends [ pkgs.tzdata ] super.tzdata; # https://hydra.nixos.org/build/128665302/nixlog/3 # Disable tests because they require a running dbus session @@ -490,6 +495,17 @@ self: super: builtins.intersectAttrs super { # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; + # llvm-ffi needs a specific version of LLVM which we hard code here. Since we + # can't use pkg-config (LLVM has no official .pc files), we need to pass the + # `dev` and `lib` output in, or Cabal will have trouble finding the library. + # Since it looks a bit neater having it in a list, we circumvent the singular + # LLVM input here. + llvm-ffi = + addBuildDepends [ + pkgs.llvmPackages_16.llvm.lib + pkgs.llvmPackages_16.llvm.dev + ] (super.llvm-ffi.override { LLVM = null; }); + # Needs help finding LLVM. spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe; @@ -814,8 +830,9 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; + http-download_0_2_1_0 = doDistribute (dontCheck super.http-download_0_2_1_0); pantry = dontCheck super.pantry; - pantry_0_5_2_1 = dontCheck super.pantry_0_5_2_1; + pantry_0_9_3_1 = dontCheck super.pantry_0_9_3_1; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. @@ -1199,18 +1216,25 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu = overrideCabal (drv: { - preCheck = drv.preCheck or "" + '' - export PATH="$PWD/dist/build/fourmolu:$PATH" - ''; - }) super.fourmolu; + # https://github.com/fourmolu/fourmolu/issues/231 + inherit ( + let + fourmoluTestFix = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/fourmolu:$PATH" + ''; + }); + in - # Test suite wants to run main executable - fourmolu_0_10_1_0 = overrideCabal (drv: { - preCheck = drv.preCheck or "" + '' - export PATH="$PWD/dist/build/fourmolu:$PATH" - ''; - }) super.fourmolu_0_10_1_0; + { + fourmolu = fourmoluTestFix super.fourmolu; + fourmolu_0_14_0_0 = fourmoluTestFix super.fourmolu_0_14_0_0; + fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; + }) + fourmolu + fourmolu_0_14_0_0 + fourmolu_0_14_1_0 + ; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 18a751666ddff..5feb1a002585b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1172,8 +1172,8 @@ self: { }: mkDerivation { pname = "AsyncRattus"; - version = "0.1.0.2"; - sha256 = "1vbkhk99m8gxdfldh3fz1ls5cpc27hj6fal6jyls6fzxlws5arkn"; + version = "0.1.0.3"; + sha256 = "19f915akipzx94qvd5p6dm2wvr6l07fl1qgql2xz0m8axbl6083r"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc ghc-boot hashtables simple-affine-space @@ -5964,6 +5964,20 @@ self: { mainProgram = "FTPLine"; }) {}; + "FULE" = callPackage + ({ mkDerivation, base, containers, deepseq, mtl, transformers }: + mkDerivation { + pname = "FULE"; + version = "0.3.0"; + sha256 = "1ir8kq8mndvbm99jm9wdd967b3424i4cpj5m56qd1052xi47q8vl"; + libraryHaskellDepends = [ + base containers deepseq mtl transformers + ]; + testHaskellDepends = [ base containers deepseq mtl transformers ]; + description = "Functional UI Layout Engine"; + license = lib.licenses.bsd3; + }) {}; + "Facebook-Password-Hacker-Online-Latest-Version" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec , hspec-discover, lens, QuickCheck, servant, servant-auth @@ -19143,8 +19157,8 @@ self: { pname = "ShellCheck"; version = "0.9.0"; sha256 = "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb"; - revision = "1"; - editedCabalFile = "0gs8q9dijsxzz6chq1gwzn34b2l2iskh72j10n47qqf598dwbjgm"; + revision = "2"; + editedCabalFile = "1bc552vfv76jq1zmqywv7a2z322v9ncz3sc69xpj0w6qwb3sd224"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23005,8 +23019,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.5"; - sha256 = "1pr9g5rhxx9v54f4d0cjwy9yr6wd32ssi23wms8kmf9avjbi0gms"; + version = "0.14.6"; + sha256 = "1qinizrhqqwx5wws1iqyxxj77b1mv7svj61sfs851sxlbnp32pll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25027,14 +25041,16 @@ self: { }) {}; "acquire" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "acquire"; - version = "0.3.1.1"; - sha256 = "12bcywg52gyh5zhf2iljy1yb1g8l52v1sjbg8bffifgh0bmnzkws"; - libraryHaskellDepends = [ base transformers ]; + version = "0.3.4"; + sha256 = "1sf35mmf1dsl6ridzcrs1fajrjd9ic60fbx2356iggm2sn5bi7k5"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Abstraction over management of resources"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "action-permutations" = callPackage @@ -25054,8 +25070,8 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.18"; - sha256 = "1fn3cyf43x18p2phs8bhacbp8zl8aifrh7ndzs0qi6n6g9sw95qn"; + version = "0.2.1"; + sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -25271,8 +25287,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "2.1.0"; - sha256 = "0w4yhpsl92wbijfkm37y3wl17vpsrf50mrgcllvd77ycak5w4nhw"; + version = "2.1.1"; + sha256 = "0vax5x1d2lf10fdrbp11n5gg0gp6qbsshrdm12f6smv8vw4sk5nv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -25537,8 +25553,8 @@ self: { }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.8.4"; - sha256 = "1l7bl0aqn5d6ph730jpwb5h0lwhvrkcw4vla0l73sxrm52j9ma58"; + version = "0.2.9.1"; + sha256 = "05sfpapaf7mg0lkqwsabspazfmczw25bv7n51skbgr5qprlmfi8r"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls @@ -26228,6 +26244,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-generics-typescript" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, process, QuickCheck, random, split + , string-interpolate, text, time + }: + mkDerivation { + pname = "aeson-generics-typescript"; + version = "0.0.0.1"; + sha256 = "1rhm37ppiqq3zl9ml1gpvzrjizpbix9vvb7ffcsvimfnwqjk2k4c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers string-interpolate text time + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath hspec process + QuickCheck random split string-interpolate text time + ]; + description = "Generates TypeScript definitions that match Generic Aeson encodings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tests"; + broken = true; + }) {}; + "aeson-helper" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -26727,11 +26768,12 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.6.0.0"; - sha256 = "1dlbxma80vjw19c8b5b0msmsd55rpnxxqb147ppy1w4d4yvsmrr3"; + version = "0.6.1.0"; + sha256 = "1ylxh4fbx01rwv1ipk1a6yfziwp1v3hy9wmpbml0s9613bwqxdvl"; libraryHaskellDepends = [ - aeson base containers mtl string-interpolate template-haskell text - th-abstraction transformers unordered-containers + aeson base bytestring containers mtl string-interpolate + template-haskell text th-abstraction transformers + unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers directory filepath hspec mtl @@ -26779,8 +26821,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.19.7.1"; - sha256 = "1w62li1g1hfdc9hf45x49fgdqs6jap06pq6nq9wr9vlmcnrzb34i"; + version = "0.19.7.2"; + sha256 = "1c7275wcsg7v0hfgf93dqbyrvm2ai8kmc45g7mbrgr2qjws3yign"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable megaparsec mtl scientific text transformers unordered-containers vector @@ -26813,8 +26855,8 @@ self: { }: mkDerivation { pname = "aeson-warning-parser"; - version = "0.1.0"; - sha256 = "19n5pnvkingw086i9adhakhj42fmp7nrphf4g6gq4y1xwa1afiry"; + version = "0.1.1"; + sha256 = "1r478ksq80594pk6mvzygs9a5b1igvszncw46lby6a3y4shdyzib"; libraryHaskellDepends = [ aeson base containers generic-deriving rio rio-prettyprint text transformers unordered-containers @@ -27117,25 +27159,24 @@ self: { }) {}; "agda2hs" = callPackage - ({ mkDerivation, Agda, base, bytestring, containers, deepseq - , directory, filepath, haskell-src-exts, mtl, process, syb, text - , unordered-containers, yaml-light + ({ mkDerivation, aeson, Agda, base, bytestring, containers, deepseq + , directory, filepath, haskell-src-exts, mtl, syb, text + , unordered-containers, yaml }: mkDerivation { pname = "agda2hs"; - version = "1.1"; - sha256 = "1wwrvsbpa0hmmqv5d4k348v3j67v46qv8hyx31y01ycxlz2dz72v"; + version = "1.2"; + sha256 = "0xd9ngvymr1wix1hhf6i3qm2sc1n2zgf6gpc2ss4plhbaw60idpx"; isLibrary = false; isExecutable = true; - enableSeparateDataOutput = true; executableHaskellDepends = [ - Agda base bytestring containers deepseq directory filepath - haskell-src-exts mtl process syb text unordered-containers - yaml-light + aeson Agda base bytestring containers deepseq directory filepath + haskell-src-exts mtl syb text unordered-containers yaml ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "agda2hs"; broken = true; }) {}; @@ -28614,8 +28655,8 @@ self: { ({ mkDerivation, alsa-core, alsa-lib, base, c2hs, unix }: mkDerivation { pname = "alsa-mixer"; - version = "0.3.0"; - sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb"; + version = "0.3.0.1"; + sha256 = "0bxxmsnh2cx63gb19mzwslslwxqhz5m26pd19xnhgs9yyc3jhp57"; libraryHaskellDepends = [ alsa-core base unix ]; librarySystemDepends = [ alsa-lib ]; libraryToolDepends = [ c2hs ]; @@ -30355,6 +30396,8 @@ self: { pname = "amazonka-core"; version = "2.0"; sha256 = "1lsd9nzyvwwp7j4kii6fp7n98x1qa6999ggwwia5sa06fgqz39bm"; + revision = "1"; + editedCabalFile = "1w8il9lg9nm71zjh050apiwvwjflmas13mp4n66g8xwpbc5wm0gp"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive conduit conduit-extra containers crypton deepseq hashable http-client @@ -33909,6 +33952,8 @@ self: { pname = "amazonka-s3-encryption"; version = "2.0"; sha256 = "1cxv36nkaqp30dm89f9bfqmh7dh0nyw4i4n0apdj7p3gckhl3jb9"; + revision = "1"; + editedCabalFile = "0b8xbcjrdh9v304i94mdkhvlhg61zmylhf6jq88kjbavlc3g2q0x"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-kms amazonka-s3 base bytestring case-insensitive conduit crypton http-client lens memory @@ -41393,8 +41438,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.3"; - sha256 = "00clpsv9ggkz34csdwx17fhz6sirvy71g897fwi33qzdv7sb2fx0"; + version = "1.0.5.4"; + sha256 = "1wiqdjxl7sg0lbsngmpksl1nflpip8wrjryaq5bvrpyyfdsq8cma"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -41596,8 +41641,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "1.0.3"; - sha256 = "1zjr27ajqigl9nlmfrh7ypry36simcbxw61is73157pg0wjb7qyr"; + version = "1.0.3.1"; + sha256 = "12x2wi90sh2g58nknbfmci1b3ncivg7rhxfp7d6w4rqd2xj1lgjr"; libraryHaskellDepends = [ attoparsec base bytestring text time ]; description = "Attoparsec parsers of time"; license = lib.licenses.mit; @@ -41972,8 +42017,8 @@ self: { ({ mkDerivation, base, reflection }: mkDerivation { pname = "auto-lift-classes"; - version = "1.0.1"; - sha256 = "031nrlghi8xmfx5wc32bcvy1fngrsd7jcjc99kfvxqyzi12ym74k"; + version = "1.1"; + sha256 = "1r0pmrj31nb0n2jhz0pzxhxmmwy6q82kxsclwpjgfvhxjn67lq5j"; libraryHaskellDepends = [ base reflection ]; testHaskellDepends = [ base ]; description = "Deriving (Show|Read)(1|2)"; @@ -44451,8 +44496,8 @@ self: { ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.10"; - sha256 = "0h16ywwf6dgazwnsqxl82l28vjx51gmh2xn8idlvc7kkl8ylgq54"; + version = "0.1.11"; + sha256 = "0sg3c8m3jl1vifd60a5yac7lm4mygmdgg77z0idjik3cndijxdd8"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -46558,14 +46603,14 @@ self: { }) {}; "benc" = callPackage - ({ mkDerivation, AttoBencode, base, bencode, bencoding, bytestring - , containers, deepseq, primitive, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, text, transformers, vector + ({ mkDerivation, base, bytestring, containers, deepseq, primitive + , tasty, tasty-bench, tasty-hunit, tasty-quickcheck, text + , transformers, vector }: mkDerivation { pname = "benc"; - version = "0.1.0.0"; - sha256 = "1nwzd89kgzc7zcswicrv848igf7p1gpgli1pj8h1dc5jnlikz3ka"; + version = "0.1.1.0"; + sha256 = "12hp6qpz9wg0myyf9sv0izhd096ilqg0xgw0i96pildlx2cfzgpi"; libraryHaskellDepends = [ base bytestring containers primitive text transformers vector ]; @@ -46574,8 +46619,8 @@ self: { vector ]; benchmarkHaskellDepends = [ - AttoBencode base bencode bencoding bytestring containers deepseq - tasty tasty-bench tasty-hunit text transformers vector + base bytestring containers deepseq tasty tasty-bench tasty-hunit + text vector ]; description = "Bencode encoding and decoding library"; license = lib.licenses.mit; @@ -47807,8 +47852,8 @@ self: { }: mkDerivation { pname = "binary-parser"; - version = "0.5.7.4"; - sha256 = "06lkx75q6ffbdjl442l035xf5rl5ykjzw4488w0xnxzlmyl4v0ms"; + version = "0.5.7.5"; + sha256 = "07ywb3z9k0hcs38617470h2y2gwgi49wp4m6a0fzvs7mnxv46bj7"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ base-prelude bytestring tasty tasty-hunit tasty-quickcheck @@ -52981,8 +53026,8 @@ self: { }: mkDerivation { pname = "box"; - version = "0.9.2.0"; - sha256 = "1gwxbhi6w4h7p1ccd7s8ay78dabg3zj129wl0bhsmn0i6axb0yik"; + version = "0.9.2.1"; + sha256 = "0qw7byh3a3zxwkkfm31ng4dl4gfg8w8c998r62ba43z9an61y8di"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time @@ -54503,6 +54548,29 @@ self: { license = lib.licenses.mit; }) {}; + "bugsnag_1_1_0_0" = callPackage + ({ mkDerivation, aeson, annotated-exception, base, bugsnag-hs + , bytestring, containers, Glob, hspec, http-client, http-client-tls + , parsec, template-haskell, text, th-lift-instances, ua-parser + , unliftio, unordered-containers + }: + mkDerivation { + pname = "bugsnag"; + version = "1.1.0.0"; + sha256 = "17iard7dzydyc9gin0b3jk9k55sr20hck71smpzyr8dfs2d3wa3z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson annotated-exception base bugsnag-hs bytestring containers + Glob http-client http-client-tls parsec template-haskell text + th-lift-instances ua-parser unliftio unordered-containers + ]; + testHaskellDepends = [ annotated-exception base hspec unliftio ]; + description = "Bugsnag error reporter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugsnag-haskell" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, containers, doctest, Glob, hspec, http-client @@ -55553,8 +55621,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.11.1"; - sha256 = "0sp96a2qd6n48nndwfzmp6gcz1lvs488sdrf3vz4lnskris2ghaj"; + version = "0.2.12.0"; + sha256 = "1r6ad6ib1fk4bhld3vkzwm1z74px562h7dwsz5gl8582igi9z2mk"; libraryHaskellDepends = [ base bytestring natural-arithmetic primitive primitive-addr primitive-unlifted run-st text text-short tuples vector @@ -55712,8 +55780,6 @@ self: { ]; description = "Type-classes to convert values to and from ByteString"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bytestring-csv" = callPackage @@ -58473,15 +58539,13 @@ self: { }: mkDerivation { pname = "cairo-image"; - version = "0.1.0.0"; - sha256 = "138aihpvys624c1kksg2d7vn7m74vilrfl3w05rgdfl2l6icgcvn"; + version = "0.1.0.2"; + sha256 = "1wslqg3gg4iiw8fjrk6nf6kfskjis8n2cxd5ksp2nw487ydijfim"; libraryHaskellDepends = [ base c-enum primitive template-haskell ]; libraryPkgconfigDepends = [ cairo ]; testHaskellDepends = [ base c-enum primitive template-haskell ]; description = "Image for Cairo"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) cairo;}; "cake" = callPackage @@ -58857,10 +58921,8 @@ self: { }: mkDerivation { pname = "call-plantuml"; - version = "0.0.1.2"; - sha256 = "1n4b079nj637djar5a7jdmqjr1mk2b4x2r0iipzrf2iwhvcw3mfk"; - revision = "1"; - editedCabalFile = "1ry3v6kdb76kbvcariwly91b9fjw4660m8piqak3xkgv743ybvgb"; + version = "0.0.1.3"; + sha256 = "0g6k5ajfdnhdni2ml31mhlgdvpkdnjsdyrppj15q8v964h68cjxk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring filepath process ]; testHaskellDepends = [ @@ -60493,6 +60555,24 @@ self: { broken = true; }) {}; + "cassava-th" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, template-haskell + , text, vector + }: + mkDerivation { + pname = "cassava-th"; + version = "0.1.0.0"; + sha256 = "1vq64yl6g3knk0vl1100q4w2hiz5pxharx1c6kf3xflcc2252cxh"; + libraryHaskellDepends = [ + base bytestring cassava template-haskell text vector + ]; + testHaskellDepends = [ + base bytestring cassava hspec template-haskell text vector + ]; + description = "`TemplateHaskell` helpers for `cassava`"; + license = lib.licenses.bsd3; + }) {}; + "cassette" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -61508,8 +61588,8 @@ self: { ({ mkDerivation, base, cereal, hashable, unordered-containers }: mkDerivation { pname = "cereal-unordered-containers"; - version = "0.1"; - sha256 = "1gwg67r8z2jzlnks4pki9lwy4hghpynlrmd504mrnw28ahfmp9wn"; + version = "0.1.0.1"; + sha256 = "07gngl4m9bzp6izlawfnxa1jbqj6c4zb0w94mdzhxr786bsgnn4k"; libraryHaskellDepends = [ base cereal hashable unordered-containers ]; @@ -62382,6 +62462,7 @@ self: { ]; description = "Polykinded Prelude Kernel"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "chatter" = callPackage @@ -67029,8 +67110,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.5.2"; - sha256 = "1pyr9f30bc3nl777a41ddnfb78bx4y44rbrs3kcxrd5j7nn5n3gv"; + version = "0.1.5.3"; + sha256 = "0zjvv8k928q9cdsqvwmgpypjinwrxsia6qzxmga8q2xg9rdgx9fc"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers data-msgpack deepseq filepath http-conduit hyraxAbif lens linear @@ -68747,8 +68828,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2.4"; - sha256 = "0mhxk8znkjmc17dr7ssikijjgis19mrp4xwc0r1c3vki4vwwwzsm"; + version = "0.2.4.1"; + sha256 = "11h4vjxr0zlqp59ap0146byc2ixkmkn77rf05dw3j122g8a1akz1"; libraryHaskellDepends = [ base bytestring containers parsec text transformers unicode-data unicode-transforms @@ -68769,8 +68850,8 @@ self: { }: mkDerivation { pname = "commonmark-cli"; - version = "0.2"; - sha256 = "1g3i01acaqfqiqkl5xyxvzrh0alfx3il4r4rcjs4ii1nwaljdg6j"; + version = "0.2.1"; + sha256 = "0gc11zz604qsjrdip3cwb8rpz2j73md9014nvmr5wzb8ds6cjnwf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68812,8 +68893,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.4"; - sha256 = "1yrz32lbipzwvxmy4i3vkvs735jfd9jvlhfzh6xm2nx2rjapnx9n"; + version = "0.2.5.1"; + sha256 = "070ziwjdgmi36h5asvss0shkay0fbpmfs210i3dq587i0v45d6zp"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -68832,8 +68913,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1.3"; - sha256 = "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"; + version = "0.2.2"; + sha256 = "12xw0mwwh87zw4m8g10z4xk1c1nhlaqkp8q2vdvsv2r5xdfvvd30"; libraryHaskellDepends = [ base commonmark commonmark-extensions pandoc-types text ]; @@ -68857,6 +68938,8 @@ self: { ]; description = "Simple interface to commonmark-hs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "commonmark-wikilink" = callPackage @@ -69408,6 +69491,7 @@ self: { ]; description = "Parse a Pandoc to a composite value"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "compdoc-dhall-decoder" = callPackage @@ -69426,6 +69510,7 @@ self: { ]; description = "Allows you to write FromDhall instances for Compdoc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "compendium-client" = callPackage @@ -69651,8 +69736,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.8.2.1"; - sha256 = "0glzqkd0vxrbajx76gfwqvrdg2q6648x64x5fm876899dr9cbss7"; + version = "0.8.2.2"; + sha256 = "1psza7v7hqarwjyagij3ishrw5wfxsrchp9jp6w7dwfj8ls2gkgb"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -69667,6 +69752,7 @@ self: { ]; description = "JSON for Vinyl records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-cofree-list" = callPackage @@ -69682,14 +69768,15 @@ self: { ]; description = "Print a Cofree [] as a JSON value"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-path" = callPackage ({ mkDerivation, base, composite-aeson, path }: mkDerivation { pname = "composite-aeson-path"; - version = "0.8.2.1"; - sha256 = "096k8wg3r4rfn4yyqpn8higglllk4mq3iwy57x33mnqgxqbdc1lm"; + version = "0.8.2.2"; + sha256 = "0xw9b0fhr44v61rzn5vi9bz859arb33irsgs7xnf3s0d6xspjdvp"; libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; license = lib.licenses.bsd3; @@ -69703,8 +69790,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.8.2.1"; - sha256 = "1k1hvhczrpx13z0zryih56dhnajmsrspaslrrbir7kbr9c3mc1jq"; + version = "0.8.2.2"; + sha256 = "0rm08bslz2nphr4ip3ljfizvjjf84fl7hd1gfq7b1q3jr5fn8jfp"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -69727,6 +69814,7 @@ self: { ]; description = "MonadThrow behaviour for composite-aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-writeonly" = callPackage @@ -69741,6 +69829,7 @@ self: { ]; description = "WriteOnly indicators for composite-aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-base" = callPackage @@ -69750,10 +69839,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.8.2.1"; - sha256 = "0i2mamh5gz7ay1cm5nkmdbh2lnaph42pfi2aa9jb2baxi0jgxdri"; - revision = "1"; - editedCabalFile = "1fww7f7z583vp7kfrf6xi6y0plpm4jsh3j72xbgarprlz25j1aip"; + version = "0.8.2.2"; + sha256 = "1ykicnm8wc18bg3w0jyg943rpnssmi58ksv25mww653c4z5kx7cp"; libraryHaskellDepends = [ base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core @@ -69766,17 +69853,20 @@ self: { ]; description = "Shared utilities for composite-* packages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-binary" = callPackage ({ mkDerivation, base, binary, composite-base }: mkDerivation { pname = "composite-binary"; - version = "0.8.2.1"; - sha256 = "0bxnzxvw5mjhz3kh6x265l70hp1z3z1y9fbdwhrgv6bhhinxb3hq"; + version = "0.8.2.2"; + sha256 = "0w5kwhdqq83312kn0w8119fin8rld9wxkjsp3yz2yg35w06nmv8d"; libraryHaskellDepends = [ base binary composite-base ]; description = "Orphan binary instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "composite-cassava" = callPackage @@ -69823,8 +69913,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.8.2.1"; - sha256 = "0c0rxa30r19wcvqrw20xk96652mxknbs1lqpnzdj9kz77al3k1kl"; + version = "0.8.2.2"; + sha256 = "0r4bf228irgnvp8b38kqd763idxqzdfavs0v9rpzwpgxb3f1xya5"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -69838,11 +69928,12 @@ self: { ({ mkDerivation, base, composite-base, hashable }: mkDerivation { pname = "composite-hashable"; - version = "0.8.2.1"; - sha256 = "1ynsmb9rw93n4dyrrfipb9glg5argh0xsbrb59jhgqi8ajfr7gwv"; + version = "0.8.2.2"; + sha256 = "10iih8jq6wz7p7qaywxhyh5pfm0jlbw51z1x2s7n12qci5sl64gj"; libraryHaskellDepends = [ base composite-base hashable ]; description = "Orphan hashable instances"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "composite-ix" = callPackage @@ -69861,6 +69952,7 @@ self: { ]; description = "Indexing utilities for composite records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "composite-lens-extra" = callPackage @@ -69872,6 +69964,7 @@ self: { libraryHaskellDepends = [ base composite-base lens vinyl ]; description = "Extra lens functions for composite"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-opaleye" = callPackage @@ -69881,8 +69974,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.8.2.1"; - sha256 = "0w62s1cd6izkvc9ycb6rz6cbc7pa8mic9rbbmwjbn9xxfcbk2xph"; + version = "0.8.2.2"; + sha256 = "0b5qi1d4l0ckcr3klfhak1r9q2y0qhx76ph56sd3jhgdi4lqqkhx"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors split template-haskell text vinyl @@ -69905,8 +69998,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.8.2.1"; - sha256 = "0sbjb60ghd86q3hxgmq4anc81ww4v4ny1ans0r9a5chp3bqvbi6a"; + version = "0.8.2.2"; + sha256 = "0csb93svrzzcj3csbixjb668jhdvlwkvx1ax14p6bmv250khqlw6"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -69932,6 +70025,7 @@ self: { libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-xml" = callPackage @@ -69951,6 +70045,7 @@ self: { ]; description = "RecXML Type"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composite-xstep" = callPackage @@ -69962,6 +70057,7 @@ self: { libraryHaskellDepends = [ base composite-base vinyl ]; description = "ReaderT transformer pattern for higher kinded composite data"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "composition" = callPackage @@ -70922,15 +71018,17 @@ self: { "conduino" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, free - , list-transformer, mtl, transformers + , list-transformer, mtl, text, transformers }: mkDerivation { pname = "conduino"; - version = "0.2.2.0"; - sha256 = "0jdhj71nva9v8f40wzkd2wzikpgwlzqid0inyfdlj4wnn83qwwk2"; + version = "0.2.4.0"; + sha256 = "0xxjcm8kccmfmy5sljw89lpy3wma7sbd3hq1lpx7232rr3qxj8pj"; + revision = "2"; + editedCabalFile = "1zyyv43zcwicabyjyp0xp4v91sy7f4c02xdw7ha5qhh28hgrckq7"; libraryHaskellDepends = [ base bytestring containers exceptions free list-transformer mtl - transformers + text transformers ]; description = "Lightweight composable continuation-based stream processors"; license = lib.licenses.bsd3; @@ -72111,8 +72209,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.7"; - sha256 = "17ik5vl6zriqgp7fxkv60l6jcfnh842rw5254ly3wy2c13nk9h4f"; + version = "0.2.9"; + sha256 = "137kp7720k8xwxdgpyjd5lrrlmg7p03jb5p60rszy34pfr3zv8v9"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -73026,8 +73124,8 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.0.2"; - sha256 = "0wrqjpdiwpv3gcxqbfn0ixqfxfp6d1xnj6slkkz744bl1dmxdhaf"; + version = "0.2.0.3"; + sha256 = "0hgpnv3bbyhksb8klb5cxalgj8p52az7gk3zpim85x9fymsplwp0"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; @@ -78403,21 +78501,22 @@ self: { mainProgram = "currycarbon"; }) {}; - "currycarbon_0_3_0_0" = callPackage - ({ mkDerivation, base, filepath, hspec, math-functions, MonadRandom - , optparse-applicative, parsec, process, random, vector + "currycarbon_0_3_0_1" = callPackage + ({ mkDerivation, base, filepath, hspec, hspec-core, math-functions + , MonadRandom, optparse-applicative, parsec, process, random + , vector }: mkDerivation { pname = "currycarbon"; - version = "0.3.0.0"; - sha256 = "0vdalraqcwvn2w530y7yzwvjrq7f7l727xsnx7k8ajwrvs13dfng"; + version = "0.3.0.1"; + sha256 = "0bgak5yamhqprrjqjslr0w7acmzgz65scm67nnqmga1yf6klz5jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath math-functions MonadRandom parsec random vector ]; executableHaskellDepends = [ base filepath optparse-applicative ]; - testHaskellDepends = [ base hspec process ]; + testHaskellDepends = [ base hspec hspec-core process ]; description = "A package for simple, fast radiocarbon calibration"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -78610,8 +78709,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.7"; - sha256 = "1p8b1lppkvc19974hr43lcqdi4nj55j2nf7gsnp8dn7gyf23aayq"; + version = "0.2.8"; + sha256 = "1v621hk9lkz7p8p521jvsa9hi7ssynj9fy1x16lhfnr18gzi789i"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api HUnit QuickCheck tagged test-framework @@ -83617,8 +83716,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.5"; - sha256 = "1riczgknn87b7cqpk8crq33zwkq80gv5ha9ang5ib5rlg6fmckn4"; + version = "0.9.18.6"; + sha256 = "00lg3f50pp5nj6lr0ia2xkfag7g7nxdg8wzfmcmpvis0010wxzzb"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector @@ -83749,6 +83848,55 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "defun" = callPackage + ({ mkDerivation, base, defun-bool, defun-core, defun-sop, sop-core + }: + mkDerivation { + pname = "defun"; + version = "0.1"; + sha256 = "1h9lihmqnqkr70br04f6vppzdm3q8k5l8n7sk1h4x3rvkykf4mly"; + libraryHaskellDepends = [ defun-bool defun-core defun-sop ]; + testHaskellDepends = [ base sop-core ]; + description = "Defunctionalization helpers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "defun-bool" = callPackage + ({ mkDerivation, base, defun-core, singleton-bool }: + mkDerivation { + pname = "defun-bool"; + version = "0.1"; + sha256 = "0w7g66w7vc2mli713frf959g2pysjr5xaagggjfq699fyscyad3k"; + libraryHaskellDepends = [ base defun-core singleton-bool ]; + description = "Defunctionalization helpers: booleans"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "defun-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "defun-core"; + version = "0.1"; + sha256 = "1vxkasxvkkk0x11r850h14fh37pfyavd0pib5zgnj4w0ddmqx00g"; + libraryHaskellDepends = [ base ]; + description = "Defunctionalization helpers: core definitions"; + license = lib.licenses.bsd3; + }) {}; + + "defun-sop" = callPackage + ({ mkDerivation, base, defun-core, sop-core }: + mkDerivation { + pname = "defun-sop"; + version = "0.1"; + sha256 = "1zd8laprbmaaxgj21n8bnrax2m9l67y950d1fs8b2bdlsc33llc8"; + libraryHaskellDepends = [ base defun-core sop-core ]; + description = "Defunctionalization helpers: lists"; + license = lib.licenses.bsd3; + }) {}; + "deiko-config" = callPackage ({ mkDerivation, array, base, containers, exceptions, mtl, parsec , text, transformers @@ -84385,14 +84533,14 @@ self: { license = lib.licenses.publicDomain; }) {}; - "dependent-sum-template_0_2_0_0" = callPackage + "dependent-sum-template_0_2_0_1" = callPackage ({ mkDerivation, base, constraints-extras, containers, mtl, some , template-haskell, th-abstraction }: mkDerivation { pname = "dependent-sum-template"; - version = "0.2.0.0"; - sha256 = "10as7ywsm83xaz6glxqpghla1zsqxqy980i1rdiiia1k3j1jsqy9"; + version = "0.2.0.1"; + sha256 = "0rba7jf9hpn73gcqqkxvfk8j5mifb49glp6gjc8k93pg78zy7yqf"; libraryHaskellDepends = [ base containers mtl some template-haskell th-abstraction ]; @@ -85242,8 +85390,8 @@ self: { }: mkDerivation { pname = "df1-html"; - version = "0.1"; - sha256 = "0qjwnh959621jm3y3hi54s2chcchflj9cmlrfysvb80ycyj6fs8x"; + version = "0.1.1"; + sha256 = "1ghqwfyv720qffvf0dmg9c4wclljzlkd9r8p5jafl96cfqqbjphb"; libraryHaskellDepends = [ attoparsec base bytestring containers df1 text time xmlbf ]; @@ -85354,119 +85502,6 @@ self: { broken = true; }) {}; - "dhall_1_29_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write - , base, bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, cryptonite, data-fix, deepseq, Diff, directory - , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, hashable, haskeline, http-client, http-client-tls - , http-types, lens-family-core, megaparsec, memory, mockery, mtl - , network-uri, optparse-applicative, parsers, pretty-simple - , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, semigroups - , serialise, special-values, spoon, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift-instances, transformers, transformers-compat, turtle - , unordered-containers, uri-encode, vector - }: - mkDerivation { - pname = "dhall"; - version = "1.29.0"; - sha256 = "1xp76wv36rfffym71gwdqsmwg3znmpsq5x9zgz3hfmzigxqmjgn7"; - revision = "2"; - editedCabalFile = "1qksvk63vmypqcd9hasacmqw7gsqcggs5lk85x7w2731mh3c3sa8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base bytestring - case-insensitive cborg cborg-json containers contravariant - cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath hashable haskeline http-client http-client-tls http-types - lens-family-core megaparsec memory mtl network-uri - optparse-applicative parsers pretty-simple prettyprinter - prettyprinter-ansi-terminal profunctors repline scientific - serialise template-haskell text th-lift-instances transformers - transformers-compat unordered-containers uri-encode vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring cborg containers data-fix deepseq directory doctest - either filepath foldl generic-random lens-family-core megaparsec - mockery prettyprinter QuickCheck quickcheck-instances scientific - semigroups serialise special-values spoon tasty - tasty-expected-failure tasty-hunit tasty-quickcheck text - transformers turtle unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring containers directory gauge serialise text - ]; - doCheck = false; - description = "A configuration language guaranteed to terminate"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "dhall"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "dhall_1_38_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write - , base, bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, cryptonite, data-fix, deepseq, Diff, directory - , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, half, hashable, haskeline, http-client - , http-client-tls, http-types, lens-family-core, megaparsec, memory - , mmorph, mockery, mtl, network-uri, optparse-applicative - , parser-combinators, parsers, pretty-simple, prettyprinter - , prettyprinter-ansi-terminal, profunctors, QuickCheck - , quickcheck-instances, repline, scientific, serialise - , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, tasty-silver, template-haskell, text - , text-manipulate, th-lift-instances, transformers - , transformers-compat, turtle, unordered-containers, uri-encode - , vector - }: - mkDerivation { - pname = "dhall"; - version = "1.38.1"; - sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk"; - revision = "2"; - editedCabalFile = "02z0jmzzp20yj46iz6i384xwc6k2anxb33smvc4yhpmhqjs0aq8a"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal atomic-write base bytestring - case-insensitive cborg cborg-json containers contravariant - cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath half hashable haskeline http-client http-client-tls - http-types lens-family-core megaparsec memory mmorph mtl - network-uri optparse-applicative parser-combinators parsers - pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors - repline scientific serialise template-haskell text text-manipulate - th-lift-instances transformers transformers-compat - unordered-containers uri-encode vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring cborg containers data-fix deepseq directory doctest - either filepath foldl generic-random http-client http-client-tls - lens-family-core megaparsec mockery prettyprinter QuickCheck - quickcheck-instances scientific serialise special-values spoon - tasty tasty-expected-failure tasty-hunit tasty-quickcheck - tasty-silver template-haskell text transformers turtle - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring containers directory gauge text - ]; - doCheck = false; - description = "A configuration language guaranteed to terminate"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "dhall"; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - "dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg @@ -87271,13 +87306,11 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.7"; - sha256 = "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"; - revision = "1"; - editedCabalFile = "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl"; + version = "0.0.2.0"; + sha256 = "0ha4f0jckngqy558shd08yp99wj87c5wazp5zr5y6as608zb7wx8"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; - description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; + description = "CRC32 and Adler32 hashes for bytestrings"; license = lib.licenses.bsd2; }) {inherit (pkgs) zlib;}; @@ -88001,14 +88034,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "directory_1_3_8_1" = callPackage + "directory_1_3_8_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.1"; - sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; - revision = "1"; - editedCabalFile = "1yd7hqs70486gbf7yms6gbx2zm34m1hakx5rh3dd4rd38w4hlfxx"; + version = "1.3.8.2"; + sha256 = "1zx0833zdalz131vwr7vckara0plm16mb86ilpj3mvd5yyvrwzkp"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -88228,29 +88259,29 @@ self: { ({ mkDerivation, algebraic-graphs, arithmoi, base, bytestring , containers, directory, exact-combinatorics, exceptions, fgl , filepath, haskeline, integer-logarithms, lens, megaparsec, mtl - , oeis, optparse-applicative, parser-combinators, polysemy - , polysemy-plugin, polysemy-zoo, pretty, pretty-show, process - , QuickCheck, simple-enumeration, split, splitmix, tasty + , optparse-applicative, parser-combinators, polysemy + , polysemy-plugin, polysemy-zoo, pretty-show, prettyprinter + , process, QuickCheck, simple-enumeration, split, splitmix, tasty , tasty-golden, transformers, unbound-generics }: mkDerivation { pname = "disco"; - version = "0.1.5"; - sha256 = "023pa9jgvxk1p56aydki91c8xmxx63m5w0v6bdyy1dqnwcgqlzzy"; + version = "0.1.6"; + sha256 = "15p8md2lssmk4fc2lzbsg0qp0zvzq4d8gxkwrrwaqjwj982cz0fz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ algebraic-graphs arithmoi base containers directory exact-combinatorics exceptions fgl filepath haskeline - integer-logarithms lens megaparsec mtl oeis optparse-applicative - parser-combinators polysemy polysemy-plugin polysemy-zoo pretty - pretty-show QuickCheck simple-enumeration split splitmix - transformers unbound-generics + integer-logarithms lens megaparsec mtl optparse-applicative + parser-combinators polysemy polysemy-plugin polysemy-zoo + pretty-show prettyprinter QuickCheck simple-enumeration split + splitmix transformers unbound-generics ]; executableHaskellDepends = [ base containers directory filepath haskeline lens megaparsec mtl - oeis optparse-applicative transformers unbound-generics + optparse-applicative transformers unbound-generics ]; testHaskellDepends = [ base bytestring directory filepath process tasty tasty-golden @@ -91051,23 +91082,20 @@ self: { "domain" = callPackage ({ mkDerivation, attoparsec, base, bytestring, domain-core, foldl - , hashable, parser-combinators, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , template-haskell-compat-v0208, text, th-lego, th-orphans - , yaml-unscrambler + , hashable, parser-combinators, rerebase, tasty, tasty-hunit + , template-haskell, template-haskell-compat-v0208, text, th-lego + , th-orphans, yaml-unscrambler }: mkDerivation { pname = "domain"; - version = "0.1.1.4"; - sha256 = "0fdpbcn2cyfpkp8qln87b27fqrsy95n7sb2x3bpwhbr5dzz55ih2"; + version = "0.1.1.5"; + sha256 = "17a49jrq967xvwkzk01rjwhp9vvhkjq9d1z3vxwbsmg4a02q1rlx"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable - parser-combinators template-haskell template-haskell-compat-v0208 - text th-lego yaml-unscrambler + parser-combinators template-haskell text th-lego yaml-unscrambler ]; testHaskellDepends = [ - base domain-core QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck template-haskell + base domain-core rerebase tasty tasty-hunit template-haskell template-haskell-compat-v0208 text th-orphans ]; description = "Codegen helping you define domain models"; @@ -91082,8 +91110,8 @@ self: { }: mkDerivation { pname = "domain-aeson"; - version = "0.1.1.1"; - sha256 = "0g363qyri9s6qbp52znah3qgnrqh0cn4xlfyp7hmjjwmllnm8dsn"; + version = "0.1.1.2"; + sha256 = "01jg6psmpywkw76yf8gasiivkxigfnr2r3hapqrig34wl9ns3ags"; libraryHaskellDepends = [ aeson base domain-core template-haskell template-haskell-compat-v0208 text th-lego vector @@ -91121,8 +91149,8 @@ self: { }: mkDerivation { pname = "domain-cereal"; - version = "0.1"; - sha256 = "0ap4rrkhp5ggwy5fjwhg0v4ii1ayxf6w7ary2k8jc82v46bpl5is"; + version = "0.1.0.1"; + sha256 = "1wpmiwyn4aki5z0idizznaq94yy0nd7c32ns5m54b9lhakb2wlg8"; libraryHaskellDepends = [ base cereal domain-core leb128-cereal template-haskell template-haskell-compat-v0208 text th-lego @@ -91133,35 +91161,33 @@ self: { }) {}; "domain-core" = callPackage - ({ mkDerivation, base, template-haskell - , template-haskell-compat-v0208, text, th-lego, th-lift-instances + ({ mkDerivation, base, template-haskell, text, th-lego + , th-lift-instances }: mkDerivation { pname = "domain-core"; - version = "0.1.0.3"; - sha256 = "0wpi5qks29ij8m1s6x3kc66dw706xn28l6vlwfrccqw77603g85a"; + version = "0.1.0.4"; + sha256 = "043f2lj3yxk42dxid2z768bnaw7v6sw08j2sp4cxj59jzzcvhn15"; libraryHaskellDepends = [ - base template-haskell template-haskell-compat-v0208 text th-lego - th-lift-instances + base template-haskell text th-lego th-lift-instances ]; description = "Low-level API of \"domain\""; license = lib.licenses.mit; }) {}; "domain-optics" = callPackage - ({ mkDerivation, base, domain, domain-core, optics, optics-core - , rerebase, template-haskell, template-haskell-compat-v0208, text - , th-lego, unordered-containers + ({ mkDerivation, base, domain, domain-core, optics-core, rerebase + , template-haskell, template-haskell-compat-v0208, text, th-lego }: mkDerivation { pname = "domain-optics"; - version = "0.1.0.3"; - sha256 = "0bfp6vidn10p0jjzmag0cdxncb5mq1qlp0v851hqps5cl9qshnbk"; + version = "0.1.0.4"; + sha256 = "1sjjdb0w7cl30wyz2gi0z9cgsky5lifps7kvhnlg0fgl7yvgnf9w"; libraryHaskellDepends = [ base domain-core optics-core template-haskell - template-haskell-compat-v0208 text th-lego unordered-containers + template-haskell-compat-v0208 text th-lego ]; - testHaskellDepends = [ domain optics rerebase ]; + testHaskellDepends = [ domain rerebase ]; description = "Integration of domain with optics"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -94026,8 +94052,8 @@ self: { }: mkDerivation { pname = "ebird-api"; - version = "0.1.0.0"; - sha256 = "1b50rdg3d3cam7g4xiklanamrfxhm8dl8kcg4h5nb4yj5f75dsad"; + version = "0.2.0.0"; + sha256 = "1p0dzm0wvkrfl64z6lk3r2y4pc02rjszxjff7lddglh2ys554hg5"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base optics servant text time ]; @@ -94042,8 +94068,8 @@ self: { }: mkDerivation { pname = "ebird-cli"; - version = "0.2.0.0"; - sha256 = "0vla1xz74qjpfa0qjfkvlp19mdv58dp1kr0m0g9jg07aqjwa4r92"; + version = "0.3.0.0"; + sha256 = "1l0pm1ha2shrm1b2qp8b9c0jrbsg8qjmq0srval1y9bxxzp2wls9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94062,8 +94088,8 @@ self: { }: mkDerivation { pname = "ebird-client"; - version = "0.1.0.0"; - sha256 = "0gvrq86gj3ss74x3vnw9das8m6xzlblhfc25vphgzbywzwcrmvrk"; + version = "0.2.0.0"; + sha256 = "14pxbpwszfmvndck9xd124g3mqj117nvdzsvqbpkm9mh68zxkvaz"; libraryHaskellDepends = [ base data-default ebird-api http-client-tls optics servant servant-client text @@ -96315,8 +96341,8 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.3.0"; - sha256 = "1xixflxi0yw4y9r1hqs54rajz429gf0dy22mr7bw450yqlj9ih1d"; + version = "0.3.1"; + sha256 = "05jnn1wwarq877azw5ba222gcs4g3zijxq7lr2i21088kbl2wcg9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102019,9 +102045,7 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; - broken = true; }) {}; "external-sort" = callPackage @@ -105211,10 +105235,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, unix }: mkDerivation { pname = "file-io"; - version = "0.1.0.1"; - sha256 = "1kxr2cdv3zmml7v3gmk2zrd2kwvph46fzv3r2ia5brq5qvm2s544"; - revision = "1"; - editedCabalFile = "0kfisk0vrjviw194rg2ildzr0qlg45wk4cwa4s3qpl3hp4zag1lj"; + version = "0.1.0.2"; + sha256 = "0ifgxiq0qzwdb9zlch0hjz4iq9r0nghmprvl1arf7b10mck618fl"; libraryHaskellDepends = [ base bytestring filepath unix ]; description = "Basic file IO operations via 'OsPath'"; license = lib.licenses.bsd3; @@ -109065,8 +109087,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "formatn"; - version = "0.3.0"; - sha256 = "01mbdnm6ryb7jyzpqwdjj0bnh6lqc3w5mxkl78fi3hqsmnksky22"; + version = "0.3.0.1"; + sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; libraryHaskellDepends = [ base containers QuickCheck text ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; @@ -109593,6 +109615,8 @@ self: { pname = "fourmolu"; version = "0.14.1.0"; sha256 = "1wqrs5fl72br5mlkf1dyna0946kxscjfgb4956mksr2fgcdqmdxl"; + revision = "1"; + editedCabalFile = "0rpfsfhz9a5bjh6hn38jnl3k46blb5cqih9zpqgcdzfq6nfz2k46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110002,8 +110026,8 @@ self: { , hspec-core, hspec-expectations-lifted, hspec-junit-formatter , http-client, http-conduit, http-link-header, http-types , hw-kafka-client, immortal, lens, lens-aeson, memcache - , monad-control, monad-validate, MonadRandom, mtl, network-uri - , nonempty-containers, path-pieces, persistent + , monad-control, monad-logger-aeson, monad-validate, MonadRandom + , mtl, network-uri, nonempty-containers, path-pieces, persistent , persistent-postgresql, postgresql-simple, primitive, pureMD5 , QuickCheck, resource-pool, resourcet, retry, safe, scientist , semigroupoids, serialise, template-haskell, text, time @@ -110013,8 +110037,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.10.5.1"; - sha256 = "0ska32n9cx7q3hn92kk2lwxwlp7yg0qgr8pjlxfpbkp9r4hp5r4s"; + version = "1.12.0.0"; + sha256 = "06c7wx5kkim4mxba9rksmw5vdf3pqj0j23yvnzd1fi58f2gjwdzk"; libraryHaskellDepends = [ aeson annotated-exception aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring @@ -110026,18 +110050,19 @@ self: { hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types - hw-kafka-client immortal lens memcache monad-control monad-validate - MonadRandom mtl network-uri nonempty-containers path-pieces - persistent persistent-postgresql postgresql-simple primitive - pureMD5 resource-pool resourcet retry safe scientist semigroupoids - serialise template-haskell text time transformers transformers-base - typed-process unliftio unliftio-core unordered-containers vector - wai wai-extra yaml yesod-core yesod-test + hw-kafka-client immortal lens memcache monad-control + monad-logger-aeson monad-validate MonadRandom mtl network-uri + nonempty-containers path-pieces persistent persistent-postgresql + postgresql-simple primitive pureMD5 resource-pool resourcet retry + safe scientist semigroupoids serialise template-haskell text time + transformers transformers-base typed-process unliftio unliftio-core + unordered-containers vector wai wai-extra yaml yesod-core + yesod-test ]; testHaskellDepends = [ aeson base Blammo bugsnag bytestring cassava conduit errors hspec http-types lens lens-aeson memcache monad-validate - nonempty-containers postgresql-simple QuickCheck vector wai + nonempty-containers postgresql-simple QuickCheck text vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; @@ -112444,8 +112469,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.9"; - sha256 = "13zanshqqfjik37ax5bfg5xi52zldrl0hywk2v6wik9gmniik7nc"; + version = "0.25.10"; + sha256 = "1da69xzxfsmkfhclm8vz6kkn6glr06kcjjag3rjydz7yz7gdi0xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118562,8 +118587,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.4.0.0"; - sha256 = "1pscx95wmykrrlycpavh1j8vwp3x0k1cfvq9ndpz3qmj8djyyxb6"; + version = "2.5.0.0"; + sha256 = "1p4nm8qv1sx4r7mg52nkxv6rymngn9h7kfxg20yyb8wx170zx5cy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118607,8 +118632,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "2.4.0.0"; - sha256 = "0glpjp3qrnbmbn8xi78lgx88v3lppljny9lxyi45dzf71hzab2yc"; + version = "2.5.0.0"; + sha256 = "1sryj91j5wmck67njbwjjz5nigajblmygrrgl7b1zf3rv44x621i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127707,6 +127732,31 @@ self: { license = lib.licenses.mit; }) {}; + "graphula_2_1_0_0" = callPackage + ({ mkDerivation, base, containers, directory, generic-arbitrary + , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl + , persistent, persistent-sqlite, QuickCheck, random, resourcet + , semigroups, temporary, text, transformers, unliftio + , unliftio-core + }: + mkDerivation { + pname = "graphula"; + version = "2.1.0.0"; + sha256 = "1xiafr59a91r8avyns6nbmm2aq4wkf1s9z8xqkzapnz82wj3xkh4"; + libraryHaskellDepends = [ + base containers directory generics-eot HUnit mtl persistent + QuickCheck random semigroups temporary text unliftio unliftio-core + ]; + testHaskellDepends = [ + base generic-arbitrary hspec markdown-unlit monad-logger persistent + persistent-sqlite QuickCheck resourcet transformers unliftio-core + ]; + testToolDepends = [ markdown-unlit ]; + description = "A simple interface for generating persistent data and linking its dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "graphula-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit @@ -127746,10 +127796,8 @@ self: { }: mkDerivation { pname = "graphviz"; - version = "2999.20.1.0"; - sha256 = "0l0zxgb938hh09qirggbaskq79mgj3s081cnr42y5vm1rp1jir2s"; - revision = "3"; - editedCabalFile = "16smnwf63z96myfw6yscxf1gpq3yn15634xh9xjkv4mf0zdl4f82"; + version = "2999.20.2.0"; + sha256 = "18kh6b5hgm8qfca2fiqzcyh7ysx8c1i72cchdmb16r3idpnyrkpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130922,8 +130970,8 @@ self: { pname = "hackage-cli"; version = "0.1.0.1"; sha256 = "023gnhdxwn36k3pd74j5jcykqbrj7nvp131mg761h8913h9ldw1r"; - revision = "4"; - editedCabalFile = "0vg0l95gri3kynmzvnbq3nw7pwg08mmia28k26pa3nvlcj8xlqjh"; + revision = "5"; + editedCabalFile = "1sgl8i9k7by80c7h5w4gvj1cbdd2lv88b70whlkri9as53n61pv9"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -132679,10 +132727,10 @@ self: { }: mkDerivation { pname = "hal"; - version = "1.0.0.1"; - sha256 = "1gdd0nbwm6hma57nw1y1gd0cc6z9zhhmim6l5miql2j6dk909mdv"; + version = "1.0.1"; + sha256 = "1fapccpb6mfrwq96s2hnra4zvl34c8qflwwhzr5y5c8ankna8924"; revision = "1"; - editedCabalFile = "0gcgy18sdhvxb9akzz4akljjhbxkxdk0vihdnnkyq6ilr740cxqd"; + editedCabalFile = "151nqdl4ivn3ljrmfqxf84gv07krn0dcwpr5fchm56mqikia1di5"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit conduit-extra containers exceptions hashable http-client http-types @@ -134144,6 +134192,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-server_7_9_0" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-uri, old-locale, parsec, process, sendfile, syb + , system-filepath, text, threads, time, transformers + , transformers-base, transformers-compat, unix, utf8-string, xhtml + , zlib + }: + mkDerivation { + pname = "happstack-server"; + version = "7.9.0"; + sha256 = "1chia8km9pd6ys1vgy6ybsqj48zmvhb2iqs60lmizdyhc5yxk0c6"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring containers directory + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-uri old-locale parsec process + sendfile syb system-filepath text threads time transformers + transformers-base transformers-compat unix utf8-string xhtml zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit parsec zlib + ]; + description = "Web related tools and services"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -134741,8 +134817,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.6.3"; - sha256 = "0ji2kk89sprw95c2p5i8m763jik1ibzgpbwif3vmr2idmmpjilz0"; + version = "0.1.7.0"; + sha256 = "08df7wxybqyjmk13haq8g72f658s1cskf2vvp25hgly0gcqy57d4"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -136567,9 +136643,9 @@ self: { , hls-overloaded-record-dot-plugin, hls-plugin-api , hls-pragmas-plugin, hls-qualify-imported-names-plugin , hls-refactor-plugin, hls-rename-plugin, hls-retrie-plugin - , hls-splice-plugin, hls-stylish-haskell-plugin, hls-test-utils - , hp2pretty, hspec-expectations, implicit-hie, lens, lens-aeson - , lsp, lsp-test, lsp-types, mtl, optparse-applicative + , hls-splice-plugin, hls-stan-plugin, hls-stylish-haskell-plugin + , hls-test-utils, hp2pretty, hspec-expectations, implicit-hie, lens + , lens-aeson, lsp, lsp-test, lsp-types, mtl, optparse-applicative , optparse-simple, prettyprinter, process, regex-tdfa, row-types , safe-exceptions, shake, shake-bench, sqlite-simple, stm , temporary, text, transformers, unix, unliftio-core @@ -136577,8 +136653,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.4.0.0"; - sha256 = "0jzbvss1ayvq43cljvn5j2bnyrmbgwv12ik81ivqsa6dnf3xbiqg"; + version = "2.5.0.0"; + sha256 = "0b9dy247izga3vdp80dmj4pykilscdbr9xs04iamcm2kqyrjc84n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136594,9 +136670,9 @@ self: { hls-overloaded-record-dot-plugin hls-plugin-api hls-pragmas-plugin hls-qualify-imported-names-plugin hls-refactor-plugin hls-rename-plugin hls-retrie-plugin hls-splice-plugin - hls-stylish-haskell-plugin lsp optparse-applicative optparse-simple - prettyprinter process safe-exceptions sqlite-simple text - unordered-containers + hls-stan-plugin hls-stylish-haskell-plugin lsp optparse-applicative + optparse-simple prettyprinter process safe-exceptions sqlite-simple + text unordered-containers ]; executableHaskellDepends = [ aeson async base base16-bytestring binary bytestring containers @@ -138928,8 +139004,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.2.2"; - sha256 = "0jz4y90lp54wh2crlxvvc21gfiwdf0rmcj8f712wbgb648lyzha8"; + version = "1.2.3"; + sha256 = "0v4v1fzhwnv7srpkcjfwvnm94yllsikisbvf721y8x0sixc1wgpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140128,6 +140204,8 @@ self: { pname = "hasql-interpolate"; version = "0.2.1.0"; sha256 = "1gmi552pkjbsxxqjprnq6696xqzh1swcib73p6892q65irgnhd5x"; + revision = "1"; + editedCabalFile = "08hr4fgxpyr663s12ihs77cqnn3hh2hlxy2n47gqp72jxj8ih8kj"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql megaparsec mtl scientific template-haskell text time transformers @@ -140260,14 +140338,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_10" = callPackage + "hasql-pool_0_10_0_1" = callPackage ({ mkDerivation, async, base, hasql, hspec, random, rerebase, stm , time }: mkDerivation { pname = "hasql-pool"; - version = "0.10"; - sha256 = "15h5ashflq55rk42yc5dh6r3gsrj31a0vfx7px5r08jgffiqmv0i"; + version = "0.10.0.1"; + sha256 = "03sdmna7hjspskza8gld4iys4pdzj968fzl8q7qs9a3wjqcnbqwy"; libraryHaskellDepends = [ base hasql stm time ]; testHaskellDepends = [ async hasql hspec random rerebase ]; description = "Pool of connections for Hasql"; @@ -140509,8 +140587,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.18"; - sha256 = "0z88skdk0i6rnwdqpy06yrhandaldll468kbkd4ilcf7fbwwk06v"; + version = "0.4.0.19"; + sha256 = "170cs69747kxnbj67acl2had47656i0bslvagh0f0mfdya1lsrmc"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -141867,6 +141945,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hcount"; + broken = true; }) {}; "hcron" = callPackage @@ -142437,8 +142516,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.2.1.2"; - sha256 = "1k89p1kpsf6hgd2z9b9alza0ha8xxwmwn9pwd4iih0211l8bs2c1"; + version = "0.2.1.3"; + sha256 = "00h5fakxbla6g2d0j2m7sndnsp8fpyqki0f0glv3139sfs47cv3b"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -143000,6 +143079,8 @@ self: { pname = "hedgehog-extras"; version = "0.5.0.0"; sha256 = "07i2pgmrpnffip5ng3fszhc8xlcvmzl02myw2m66kj3hmp5pps03"; + revision = "1"; + editedCabalFile = "1dqw5wfl83gs43b7wnqzys1izrr5nqg5k8cj28ppl4qylhvqdar0"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory exceptions filepath hedgehog http-conduit mmorph mtl network @@ -148458,7 +148539,7 @@ self: { ]; }) {}; - "hledger_1_32" = callPackage + "hledger_1_32_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -148469,8 +148550,10 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.32"; - sha256 = "0vgz7fv66bq7q1dc83na6jx2ihi8xvp69rj88n002hzssv8cnyjk"; + version = "1.32.1"; + sha256 = "02himlkcb3imvm7h7d09hqbi0rrlq4cl41sc6gnc20dmd4xps7fc"; + revision = "1"; + editedCabalFile = "0kx818p2f3785g0ac102nl4zrhm3xygx4lxj7ndqvrqkqr13zh8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148608,6 +148691,8 @@ self: { pname = "hledger-iadd"; version = "1.3.19"; sha256 = "12x9qdn0p2sq0z1q1gnxnajkvdlyk25xywq7yi7il1hqdrz1mkmf"; + revision = "1"; + editedCabalFile = "1vkjjdmcn0gxgz9fmy1bvn76kf77krrgpvawydc5rvgwyvmmvnsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148640,8 +148725,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "1"; - editedCabalFile = "17l6skwg9s598r7k8y6fmqa44vmk2yqrbgkf3g39xiygf1hn6ags"; + revision = "2"; + editedCabalFile = "0bb1bhybiaih7fc54y3n24xrcpxv6k6iccv2c6byypbcv4jx8m8d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148715,7 +148800,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_32" = callPackage + "hledger-lib_1_32_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -148728,8 +148813,10 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.32"; - sha256 = "09yhnkwd40b86mpn38y390wznxhr18fhfp9vqhs6iglfcyqwa7wf"; + version = "1.32.1"; + sha256 = "0dy69cwy06kdzfpg26fpdn50vq1ln1li34r23gyr6z78rj39dwbs"; + revision = "1"; + editedCabalFile = "0qzkgdv0n8vhjg17pw1al0x49is4f4x4c2ls3lr8dmkb87qgjj1i"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -148836,7 +148923,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_32" = callPackage + "hledger-ui_1_32_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -148845,8 +148932,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.32"; - sha256 = "1my838nxyrm2751n6p8nxq7q8rkg4p7vwiqzig2z65r3fixqyj6g"; + version = "1.32.1"; + sha256 = "0ldawz7xcrrb0z6aldblixp5jrhfg47hzznzz8d5yw63idqbgkbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148922,7 +149009,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_32" = callPackage + "hledger-web_1_32_1" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory @@ -148935,8 +149022,10 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.32"; - sha256 = "1wikhzvv3s71nlpkfpxy7df8crdmvfhh5s1zy4x9xvd3ryv901h1"; + version = "1.32.1"; + sha256 = "1y4ahgxgj93pg4ycxv5phiwic5b4n8474ia2wxa221jav056b37z"; + revision = "1"; + editedCabalFile = "1v48mcbjig0y8qq15p53ndccj44b6syhkgb45dbzmwy6nypx1bzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149327,8 +149416,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.4.0.0"; - sha256 = "0w3hk0cnrj7llchfrr3zdqh8m3bfz8xkax6r6a6vr3gcmyl7cwim"; + version = "2.5.0.0"; + sha256 = "17splsfhi130cxq84947261r9b2f3x9rxb2kx1jqv99qf91g11h9"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -149361,8 +149450,8 @@ self: { }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.4.0.0"; - sha256 = "1gv3jb6i7q2bwi6fzxl7gc9rjkws924l7nybkaj8m2zjzpchqqvr"; + version = "2.5.0.0"; + sha256 = "0vzljivyd0pba03rbx8n07zajs7mn6jf8qd9mr28w2wc8lqzwy39"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl process-extras text transformers @@ -149381,8 +149470,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.4.0.0"; - sha256 = "17mmf5dsgsi08gvv6lalg2w92vsb6vx0vrl5n905wvngij3vydr3"; + version = "2.5.0.0"; + sha256 = "1q0wsngvngx9hkssvkfyvwvp243rw9z31ay7rgpy4nmv3j4sf47q"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -149405,8 +149494,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.4.0.0"; - sha256 = "03zjkx2i89yn5xlw4y8vdm8b7l40y04g0shck4cl9vj7sixfbpl0"; + version = "2.5.0.0"; + sha256 = "15wdl6r8www7najnvamgbxp4rjbvwrfp0hk5f8wmsklfr5y4xqcs"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -149426,8 +149515,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.4.0.0"; - sha256 = "1hz96bklyzhs625hhyzs3vzq2a5rvvdik22ijz3ixd7wgp2nqw18"; + version = "2.5.0.0"; + sha256 = "1q7gnyg6pxzgp917z9rybp0736ssz6xiviqcnsnvr4ifvrzhnc2m"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -149447,8 +149536,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.4.0.0"; - sha256 = "1qk332msaj7lhin5dc8fyc319ls74i1f5mac118bhsz8ikrsdd64"; + version = "2.5.0.0"; + sha256 = "0v33bgv52y43d5n8fd7clllxra4hmrviqi9ymxjkx6zj0vh5i3as"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -149469,8 +149558,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.4.0.0"; - sha256 = "0lif9fg273i84w0nxslq2c8x62p5i8ymff1nhdqhmqac391agjka"; + version = "2.5.0.0"; + sha256 = "129c2y3jpibn2lh8j9y310jxrzicw47dks40jacc9qvicyw1amz3"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -149495,8 +149584,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.4.0.0"; - sha256 = "0qqhbwwj66ysgnfnl7fahv9mhfxxj46p37633hn142fhzr8vmp51"; + version = "2.5.0.0"; + sha256 = "16a5wblz1pp7l1n211a8l6vm2cizmlnrgqlxfhpwpyvsglgw2nqc"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -149537,8 +149626,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.4.0.0"; - sha256 = "0vd04sym8490briy8fpmbqy49vp70zw5c3r41kc9d65pglj8ph2y"; + version = "2.5.0.0"; + sha256 = "0v4l3jlh5kx7qfwr3sssfpi4q4sjg064h1svlgwdci02pax43zmf"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -149556,8 +149645,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.4.0.0"; - sha256 = "175whhrpngi1pi86xb2rkgbnv9kd8gwwy6d80xc0jrx62nv6q0na"; + version = "2.5.0.0"; + sha256 = "0lxdr210k02qqmqx54gni4m1jfv1lab4kayn19k1lrbwdw95nnfz"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -149577,8 +149666,8 @@ self: { }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.4.0.0"; - sha256 = "165c7knyr926ypcsyq3yafmahzn6hcnk0a6j3n0nx24wmv1912ww"; + version = "2.5.0.0"; + sha256 = "0945p1rg7dz9bfj9q72as1f43bgfsz3wigcngz3i5z94qwfjdcqb"; libraryHaskellDepends = [ aeson base containers ghc ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -149596,8 +149685,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.4.0.0"; - sha256 = "1pj61iximld14qkbjk4icbxrnnys7gmq03y4whr9qxdh93ij7b0q"; + version = "2.5.0.0"; + sha256 = "0z8cad7zjqr4wyl9pc4l3ixwhg8yqxv6ryrwg0pyqg38wh2bkya3"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -149613,8 +149702,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.4.0.0"; - sha256 = "113xfdv9f83z5sbcra6065j2snhf6h964858rcj1xw6jb5sjhfrb"; + version = "2.5.0.0"; + sha256 = "008fp1frkrh7plk2hs4g41xn29dcjndmj4inyh5qzp5kyqqpyl3s"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -149636,8 +149725,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.4.0.0"; - sha256 = "1hhvgw8k216m1cw50q5lsgl0zm5a6bp18ycpmpi4nwggazzr3hpj"; + version = "2.5.0.0"; + sha256 = "1i5w1lch8r0b93qwwxbm10q88gi9ppwjxpypc8bm96k8kfgnp53i"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -149659,8 +149748,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.4.0.0"; - sha256 = "0h9sf9416mg2wrgq1jmwjbm1bm9hav1qp6jn1imhlwg59ck99j25"; + version = "2.5.0.0"; + sha256 = "1w35z067cdbj5addz3qslg7494gzvv2gfn1y3ximg3y2y5z8xfgr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -149699,8 +149788,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.4.0.0"; - sha256 = "136fjmsm6anjxp30ysii0n63fz895k273xwn6i85s6vl3bvlyvxk"; + version = "2.5.0.0"; + sha256 = "15hggsv0z1xj21bq04chdvp0ksb6887hhbn5nlb7w0lvs3g7di18"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -149723,8 +149812,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.4.0.0"; - sha256 = "01mj0g5nghhkbhannvh45rsxnb0sffdhx6ly98im4y19xmx50gkr"; + version = "2.5.0.0"; + sha256 = "0fcpm4qb0wwy4svqa8rjxld4swahgnsbyg8gcmrc3669q4jmcy0x"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -149741,8 +149830,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.4.0.0"; - sha256 = "0xi6qds51ds6z2l6h53d16krjc19wibcpkbxhb9v6ar0fdffbnvx"; + version = "2.5.0.0"; + sha256 = "0llg94i4v12v88zlgnqzb1qimni4kipn61pgp5ahimsh3g6gw66d"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl ormolu process-extras text transformers @@ -149764,8 +149853,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.4.0.0"; - sha256 = "02frs42fx0snvwld950yk039c7m5m66fgz92rpkhbrnm225i0084"; + version = "2.5.0.0"; + sha256 = "11w9fqw8rqivk0scqs4r64z2khhlhamfs212yf35m6xd50cq7ss6"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -149790,8 +149879,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.4.0.0"; - sha256 = "1yqnxsh9n5dk1kky5j36sm6lsb1zvk5r28mb3p99a9yvhcqp0zqy"; + version = "2.5.0.0"; + sha256 = "0p1hx160sb26fnzdsq5x5n8lb750m95fmjgz3k0sysdfljkpw0b7"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -149800,8 +149889,8 @@ self: { time transformers unix unliftio unordered-containers ]; testHaskellDepends = [ - base containers lsp-types tasty tasty-hunit tasty-quickcheck - tasty-rerun text + base containers data-default lens lsp-types tasty tasty-hunit + tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ base criterion deepseq lsp-types random random-fu @@ -149817,8 +149906,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.4.0.0"; - sha256 = "04cy5530227m1hr62h76w7918315sxq8iqvhd9igllwh3ackyx9j"; + version = "2.5.0.0"; + sha256 = "0f8qdqsgkdra1pin7rbnwg9jbkg6m9g066bg8xakm0px2mdfl2ml"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -149837,8 +149926,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.4.0.0"; - sha256 = "1zianxwdvbm49s9bvzk0wji4i2zyy36i5g9isdzv70hw5rl82jvx"; + version = "2.5.0.0"; + sha256 = "04qmkz68mmp0407libdb7k53a3m9i6ykcp0izp386l6r2sgqrhjx"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -149860,8 +149949,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.4.0.0"; - sha256 = "02s6n5wy46kfsy91vsfkk92qi23ji525n7g5f3nbnvmmpvd4kn8y"; + version = "2.5.0.0"; + sha256 = "12zgy7dm8xvj5r8wkxbpb2ksszlp3w2aps3yfyz6j7np7y6c776s"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -149908,8 +149997,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.4.0.0"; - sha256 = "0ydnrmxq5ix0ly0mwsl3nxxrbwr6r975fcdw7cwz0bmyrma48w3h"; + version = "2.5.0.0"; + sha256 = "0aaxvvvib34lz59ha097rx9kzf8s6cyycsmgn97c2da62hikyf3d"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -149931,8 +150020,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.4.0.0"; - sha256 = "15llh584scavr6snr8bjc8kp8dz7vyh3vclsz2pzpkdcbr8ifhri"; + version = "2.5.0.0"; + sha256 = "0j0gg3cma80kr6ip83v5yb22n3l6h8iqdn9rk30h8g45xyngydmb"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -149980,8 +150069,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.4.0.0"; - sha256 = "0d42bjq4iyk5376rg4s97rv8j19y6cc9w1s7i0qm8zcbkp8vkgmc"; + version = "2.5.0.0"; + sha256 = "1lygi715cvnkxx5ajk1k15w6rbjb50jaa0ryfbxq56ngddfxnd0h"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -149995,15 +150084,26 @@ self: { }) {}; "hls-stan-plugin" = callPackage - ({ mkDerivation }: + ({ mkDerivation, aeson, base, containers, data-default, deepseq + , filepath, ghc, ghcide, hashable, hie-compat, hls-plugin-api + , hls-test-utils, lens, lsp-types, stan, text, transformers + , unordered-containers + }: mkDerivation { pname = "hls-stan-plugin"; - version = "2.2.0.0"; - sha256 = "0y4s6m3kw4ab0g6h7dgbsxjm61ryk1i7skdvr8h8w5m39lm46hkw"; + version = "2.5.0.0"; + sha256 = "15xfgqg24qbnzlj3pkf5qvpxmiwf5a3wzh6gznwg502fcm98i1yh"; + libraryHaskellDepends = [ + base containers data-default deepseq ghc ghcide hashable hie-compat + hls-plugin-api lsp-types stan text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base containers filepath hls-plugin-api hls-test-utils lens + lsp-types text + ]; description = "Stan integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-stylish-haskell-plugin" = callPackage @@ -150013,8 +150113,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.4.0.0"; - sha256 = "0dz6wmj9qdccdhpdz4qa8c68a8hx8p6h9ycnj6fg2yihg9j33qqb"; + version = "2.5.0.0"; + sha256 = "19zf5lm9sdcpzyvffwq92am9yfbi060sprj57s085a4f08ng1f2d"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -150045,8 +150145,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.4.0.0"; - sha256 = "0flb9sjaf3pbyr23a4399ygvf8ii692w9axbskfx9mwqndgc1jlw"; + version = "2.5.0.0"; + sha256 = "1m9kp80wsq6yjjvam9cdpbzb1j20kp2w3fgvmd7mrivkbwlblzz0"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -153885,28 +153985,31 @@ self: { "hprox" = callPackage ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , case-insensitive, conduit, conduit-extra, dns, fast-logger - , http-client, http-client-tls, http-reverse-proxy, http-types - , http2, optparse-applicative, random, tls, tls-session-manager - , wai, wai-extra, warp, warp-tls + , case-insensitive, conduit, conduit-extra, crypton, dns + , fast-logger, http-client, http-client-tls, http-reverse-proxy + , http-types, http2, optparse-applicative, random, tls + , tls-session-manager, unordered-containers, wai, wai-extra, warp + , warp-tls }: mkDerivation { pname = "hprox"; - version = "0.5.4"; - sha256 = "15hlf6mhm2wpgmafnr4jqqxgr83cpfp1dk48a41q3sdf2l8h4pkx"; + version = "0.6.0"; + sha256 = "1m9n0z7yjd81kn13ps5bgnw7zfpz4p832wwidqhqbv9yc3m6sjfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra dns fast-logger http-client http-client-tls - http-reverse-proxy http-types http2 optparse-applicative random tls - tls-session-manager wai wai-extra warp warp-tls + conduit conduit-extra crypton dns fast-logger http-client + http-client-tls http-reverse-proxy http-types http2 + optparse-applicative random tls tls-session-manager + unordered-containers wai wai-extra warp warp-tls ]; executableHaskellDepends = [ async base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra dns fast-logger http-client http-client-tls - http-reverse-proxy http-types http2 optparse-applicative random tls - tls-session-manager wai wai-extra warp warp-tls + conduit conduit-extra crypton dns fast-logger http-client + http-client-tls http-reverse-proxy http-types http2 + optparse-applicative random tls tls-session-manager + unordered-containers wai wai-extra warp warp-tls ]; description = "a lightweight HTTP proxy server, and more"; license = lib.licenses.asl20; @@ -158781,6 +158884,19 @@ self: { broken = true; }) {}; + "hspec-formatter-github" = callPackage + ({ mkDerivation, base, hspec, hspec-api, hspec-core }: + mkDerivation { + pname = "hspec-formatter-github"; + version = "0.1.0.0"; + sha256 = "10a9czdhi7ib08qrkvds5q4s1pz9v5ccq63j2fggy5038jpgw8gb"; + libraryHaskellDepends = [ base hspec-api hspec-core ]; + testHaskellDepends = [ base hspec hspec-api hspec-core ]; + description = "A Formatter for hspec that provides Github Actions Annotations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-golden_0_1_0_3" = callPackage ({ mkDerivation, base, directory, hspec, hspec-core , optparse-applicative, silently @@ -160751,10 +160867,10 @@ self: { }: mkDerivation { pname = "html-parse"; - version = "0.2.0.2"; - sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; - revision = "3"; - editedCabalFile = "1qx04ipdx16a4xg3idfziv8d9xpjzcska49wigfsxl6injahmra4"; + version = "0.2.1.0"; + sha256 = "1vjy8bmxg0dsmq74hahmn1mkkgf7jm5qwhcfc8bsmm82c6jg08xx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -162288,8 +162404,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.6.0.1"; - sha256 = "0a0fc9rqr1crbb1sbq3gzbkwjcfff662d4bgmy3vzspk7ky697ld"; + version = "0.6.0.2"; + sha256 = "13ln90didwh4r0jb77i05csmimrl9p1mv71c7ygz9bi3zk8mvl7l"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive conduit conduit-extra containers http-client http-types network resourcet @@ -165941,6 +166057,34 @@ self: { broken = true; }) {}; + "hyperbole" = callPackage + ({ mkDerivation, base, bytestring, casing, containers, effectful + , file-embed, http-api-data, http-types, string-conversions + , string-interpolate, text, wai, wai-middleware-static, warp + , web-view + }: + mkDerivation { + pname = "hyperbole"; + version = "0.1.2"; + sha256 = "0jg0dmidcc8l0j932xy5qmfcih15i2dgxgz5s5w0mamwx96apr82"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring casing containers effectful file-embed + http-api-data http-types string-conversions string-interpolate text + wai warp web-view + ]; + executableHaskellDepends = [ + base bytestring casing containers effectful file-embed + http-api-data http-types string-conversions string-interpolate text + wai wai-middleware-static warp web-view + ]; + description = "Web Framework inspired by HTMX"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "example"; + }) {}; + "hyperdrive" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing , extensible-exceptions, mtl, network, pipes, pretty @@ -166196,23 +166340,23 @@ self: { "hyraxAbif" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath - , hedgehog, hscolour, pretty-show, protolude, text + , hedgehog, hscolour, pretty-show, text, verset }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.4.2"; - sha256 = "0k0pwvcsdmjr8vynz61hja35k1bpny6d3j2wppqf9jwgl031nh13"; + version = "0.2.4.5"; + sha256 = "1pghbrvpjvlapgc8j3bm8gjrd16n47400g4jgbalzydmkpki2x2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring directory filepath hscolour pretty-show - protolude text + base binary bytestring directory filepath hscolour pretty-show text + verset ]; executableHaskellDepends = [ - base bytestring hscolour pretty-show protolude text + base bytestring hscolour pretty-show text verset ]; testHaskellDepends = [ - base binary bytestring hedgehog protolude text + base binary bytestring hedgehog text verset ]; description = "Modules for parsing, generating and manipulating AB1 files"; license = "(BSD-3-Clause OR Apache-2.0)"; @@ -172173,8 +172317,8 @@ self: { }: mkDerivation { pname = "irc"; - version = "0.6.1.0"; - sha256 = "1q9p2qwfy9rsfyaja4x3gjr8ql2ka2ja5qv56b062bdkvzafl5iq"; + version = "0.6.1.1"; + sha256 = "06gzmiwisa46nbkvj7ydk97krrrxh8m2lkbsjr0w3xdqwn8j0l86"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -172393,8 +172537,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.6.1"; - sha256 = "00dw9ay5x4hb8p2jvxwgcxqlny7cpm6lk5kqaw9yc9c6m6705fqc"; + version = "0.6.6.2"; + sha256 = "085w7svvbb1caajjh815rg35cafxw398qshmsf0b1q15la1va0zy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172404,9 +172548,7 @@ self: { executableHaskellDepends = [ base ]; description = "A library for writing IRC bots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ircbot-demo"; - broken = true; }) {}; "ircbouncer" = callPackage @@ -172837,27 +172979,6 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.11"; - sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; - libraryHaskellDepends = [ - base bytestring containers hashable primitive text - unordered-containers vector - ]; - testHaskellDepends = [ - bytestring primitive QuickCheck quickcheck-instances rebase tasty - tasty-quickcheck text vector - ]; - description = "Isomorphism typeclass solving the conversion problem"; - license = lib.licenses.mit; - }) {}; - - "isomorphism-class_0_1_0_12" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck - , text, unordered-containers, vector - }: - mkDerivation { - pname = "isomorphism-class"; version = "0.1.0.12"; sha256 = "1ffcjf2lic1mvvxfrfi0cc9qnz5qh73yjd3dsaq5p0h0amp8gppr"; libraryHaskellDepends = [ @@ -172870,7 +172991,6 @@ self: { ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "isotope" = callPackage @@ -174148,6 +174268,24 @@ self: { broken = true; }) {}; + "java-adt_1_0_20231204" = callPackage + ({ mkDerivation, alex, array, base, happy, pretty }: + mkDerivation { + pname = "java-adt"; + version = "1.0.20231204"; + sha256 = "055yrn1pvv35sl79djm4c7yb4354dmwisj5whcpynn20caq9nsy5"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base pretty ]; + executableToolDepends = [ alex happy ]; + description = "Create immutable algebraic data structures for Java"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "java-adt"; + broken = true; + }) {}; + "java-bridge" = callPackage ({ mkDerivation, base, bimap, containers, cpphs, directory , filepath, hinduce-missingh, hint, mtl, multimap, named-records @@ -176262,18 +176400,17 @@ self: { "json-spec-openapi" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, json-spec, lens - , openapi3, scientific, text, time + , openapi3, text, time }: mkDerivation { pname = "json-spec-openapi"; - version = "0.1.0.2"; - sha256 = "1y2w13py1jlmzh9wr37hc9mw16fh4lw25sfilxagqhm69fkglk8w"; + version = "0.1.0.3"; + sha256 = "07yiglfkf6alqwidkq4mqcp449mxf2461zrclh90bxix5agk5ppc"; libraryHaskellDepends = [ aeson base json-spec lens openapi3 text ]; testHaskellDepends = [ - aeson base bytestring hspec json-spec lens openapi3 scientific text - time + aeson base bytestring hspec json-spec lens openapi3 text time ]; description = "json-spec-openapi"; license = lib.licenses.mit; @@ -176626,6 +176763,27 @@ self: { license = lib.licenses.mit; }) {}; + "jsonifier_0_2_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, criterion, hedgehog + , numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.2.1.3"; + sha256 = "1qpci8fmmlxf98d6fmsnsxmkx4rgrx73fad8ii738hgrnp0n7hwn"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ + aeson criterion rerebase text-builder + ]; + description = "Fast and simple JSON encoding toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonl" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { @@ -188331,8 +188489,8 @@ self: { }: mkDerivation { pname = "linear-programming"; - version = "0.0"; - sha256 = "0bpsm47g6knpwh4gqg2myljrivpk716ip41g3cpxvpsnq0qqz57i"; + version = "0.0.0.1"; + sha256 = "0m485xdivj08c4nygfi5d27448f12mcdiq03l170mk2jhx8ncmfx"; libraryHaskellDepends = [ base comfort-array non-empty QuickCheck random transformers utility-ht @@ -188728,6 +188886,7 @@ self: { description = "Lightweight library for building HTTP API"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linnet-aeson" = callPackage @@ -189238,8 +189397,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.2.5"; - sha256 = "0i9487xz1cfmn3nv58wlm685ljvqq1iqfyz1rkx549wa5h4zmdjq"; + version = "0.9.4.7"; + sha256 = "0q1h3ih7k8h6q9ly32122zmv81yr5kn1xb22434afi7dbpq5i7kc"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -189351,16 +189510,16 @@ self: { }) {}; "liquidhaskell" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim - , liquidhaskell-boot, z3 + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-bignum + , ghc-prim, liquidhaskell-boot, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.2.8.0"; - sha256 = "1n4dkahiaci6j502w5ksqpb1g7v8rwf3hbhqqprjmcc6cl5ppyzn"; + version = "0.9.4.7.0"; + sha256 = "0lqrq500nqvnh4s69s3xwz76z5v6wljdg2w74z88q208skm3ba6b"; setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - base bytestring containers ghc-prim liquidhaskell-boot + base bytestring containers ghc-bignum ghc-prim liquidhaskell-boot ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; @@ -189380,8 +189539,8 @@ self: { }: mkDerivation { pname = "liquidhaskell-boot"; - version = "0.9.2.8.0"; - sha256 = "0q1rknlqi4x9gpkl9yvrzxfkbkcs6m883dhpvlymqpvsp2qs22b1"; + version = "0.9.4.7.0"; + sha256 = "02z6bm4nkdq7k0ki6xfkrdm3kqfdaag9hy28ii4mk48awj80h3f4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring Cabal cereal cmdargs containers @@ -190350,8 +190509,7 @@ self: { librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.thielema ]; }) {LLVM = null;}; "llvm-ffi-tools" = callPackage @@ -195838,8 +195996,8 @@ self: { }: mkDerivation { pname = "mappings"; - version = "0.2.2.0"; - sha256 = "1jsv6w8bm0zp8j03r0348aikpn73f7rh49hcildihxal24jkl5kc"; + version = "0.3.0.0"; + sha256 = "0ljjai9b46d6gsd1w99daincnvs0ckbx81z3y2z1sljn7nay88np"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202718,8 +202876,8 @@ self: { }: mkDerivation { pname = "moffy"; - version = "0.1.0.0"; - sha256 = "131dxjsqqcpm3x5y34k311bnz8fnlaqkf65qzywv3dph1slsqqkm"; + version = "0.1.1.0"; + sha256 = "1wiz0m1qjvld5c0pdfcs9difx0n085wxqxldhj64c6snjcycbj2w"; libraryHaskellDepends = [ base extra-data-yj freer-par-monad time type-flip type-set ]; @@ -202730,6 +202888,97 @@ self: { license = lib.licenses.bsd3; }) {}; + "moffy-samples" = callPackage + ({ mkDerivation, aeson, base, bytestring, extra-data-yj, hashable + , JuicyPixels, moffy, moffy-samples-events, text, time + , transformers, type-flip, type-set, unordered-containers + }: + mkDerivation { + pname = "moffy-samples"; + version = "0.1.0.2"; + sha256 = "162c8crnj3946fa5d4cgfbqai5pxgai67q3kcl3nyf29knlmivi4"; + libraryHaskellDepends = [ + aeson base bytestring extra-data-yj hashable JuicyPixels moffy + moffy-samples-events text time transformers type-flip type-set + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring extra-data-yj hashable JuicyPixels moffy + moffy-samples-events text time transformers type-flip type-set + unordered-containers + ]; + description = "Samples of moffy"; + license = lib.licenses.bsd3; + }) {}; + + "moffy-samples-events" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , http-conduit, JuicyPixels, moffy, monads-tf, process, random, stm + , text, time, type-flip, type-set, union-color + }: + mkDerivation { + pname = "moffy-samples-events"; + version = "0.2.2.4"; + sha256 = "0bsfp0rjm6dqnbnp8q62r1qf1d2v8h03a2j09cvcrc97sw61gqa7"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq http-conduit JuicyPixels + moffy monads-tf process random stm text time type-flip type-set + union-color + ]; + testHaskellDepends = [ + aeson base bytestring containers deepseq http-conduit JuicyPixels + moffy monads-tf process random stm text time type-flip type-set + union-color + ]; + description = "Events for sample codes of moffy"; + license = lib.licenses.bsd3; + }) {}; + + "moffy-samples-gtk4" = callPackage + ({ mkDerivation, base, moffy, moffy-samples, moffy-samples-gtk4-run + }: + mkDerivation { + pname = "moffy-samples-gtk4"; + version = "0.1.0.1"; + sha256 = "0bbr88gbq8yxr5jrimyyrxmlar3v88knnc7cn3bq84r9fggj78yx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base moffy moffy-samples moffy-samples-gtk4-run + ]; + testHaskellDepends = [ base ]; + description = "Sample executables of moffy - GTK4 version"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "moffy_samples_gtk4"; + }) {}; + + "moffy-samples-gtk4-run" = callPackage + ({ mkDerivation, base, c-enum, c-struct, containers + , exception-hierarchy, gtk4, moffy, moffy-samples-events, random + , simple-cairo, simple-pango, stm, text, time, type-flip, type-set + , union-color + }: + mkDerivation { + pname = "moffy-samples-gtk4-run"; + version = "0.2.1.2"; + sha256 = "15vmkwc72w9ir7kqa0mhypa6x8y5mxi2lg1fylbcckv5i42kb7n1"; + libraryHaskellDepends = [ + base c-enum c-struct containers exception-hierarchy moffy + moffy-samples-events random simple-cairo simple-pango stm text time + type-flip type-set union-color + ]; + libraryPkgconfigDepends = [ gtk4 ]; + testHaskellDepends = [ + base c-enum c-struct containers exception-hierarchy moffy + moffy-samples-events random simple-cairo simple-pango stm text time + type-flip type-set union-color + ]; + description = "Package to run moffy samples - Gtk4 version"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk4;}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, fail, filepath, html, HTTP @@ -203380,8 +203629,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.1.1"; - sha256 = "17kz1qbf5n1sdznsyvk3lfc7w6sad5b32143w3kr2gni3p0ms3ln"; + version = "0.4.1.2"; + sha256 = "0laajzbmzyf7717m0ikirkkxcsrhiwd7l3yn5cchk7rzb92z4yzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205094,38 +205343,36 @@ self: { "monomer" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring , bytestring-to-vector, c2hs, containers, data-default, exceptions - , extra, formatting, glew, hspec, http-client, JuicyPixels, lens - , mtl, nanovg, OpenGLRaw, process, sdl2, stm, text, text-show, time - , transformers, vector, wreq + , extra, foreign-store, formatting, glew, hspec, http-client + , JuicyPixels, lens, mtl, nanovg, OpenGLRaw, process, sdl2, stm + , text, text-show, time, transformers, vector, wreq }: mkDerivation { pname = "monomer"; - version = "1.5.1.0"; - sha256 = "13z6ls2y8d4r98dwxl8d65xf0rcs4i0v65zlq93i7yk5zcyw0s8i"; - revision = "2"; - editedCabalFile = "0lqkppaak0bxmnihrjpxbav2p9pdcsyybb5sshan0wbwfvxyqh84"; + version = "1.6.0.0"; + sha256 = "15cpybwdsh3yq9xhcrk0fpa0dcc805p9q6kn6qcz86khkvmp5qpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base bytestring bytestring-to-vector containers - data-default exceptions extra formatting http-client JuicyPixels - lens mtl nanovg OpenGLRaw process sdl2 stm text text-show time - transformers vector wreq + data-default exceptions extra foreign-store formatting http-client + JuicyPixels lens mtl nanovg OpenGLRaw process sdl2 stm text + text-show time transformers vector wreq ]; librarySystemDepends = [ glew ]; libraryPkgconfigDepends = [ glew ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ async attoparsec base bytestring bytestring-to-vector containers - data-default exceptions extra formatting http-client JuicyPixels - lens mtl nanovg OpenGLRaw process sdl2 stm text text-show time - transformers vector wreq + data-default exceptions extra foreign-store formatting http-client + JuicyPixels lens mtl nanovg OpenGLRaw process sdl2 stm text + text-show time transformers vector wreq ]; testHaskellDepends = [ async attoparsec base bytestring bytestring-to-vector containers - data-default exceptions extra formatting hspec http-client - JuicyPixels lens mtl nanovg OpenGLRaw process sdl2 stm text - text-show time transformers vector wreq + data-default exceptions extra foreign-store formatting hspec + http-client JuicyPixels lens mtl nanovg OpenGLRaw process sdl2 stm + text text-show time transformers vector wreq ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; @@ -205165,8 +205412,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.3.1.1"; - sha256 = "1akfgsz0j0ybgs2zynp9hbssbn8v457az2g6z094fylgcg2s3aix"; + version = "0.3.1.2"; + sha256 = "0x5x57x9vh5jk13qj9946qhcz4kw99r5g3qr7cpyarqclzmp65wl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206614,7 +206861,6 @@ self: { testHaskellDepends = [ base hspec ip text ]; description = "Datastructures to describe TCP and MPTCP connections"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mptcp-pm" = callPackage @@ -207857,18 +208103,25 @@ self: { }: mkDerivation { pname = "mueval"; - version = "0.9.3"; - sha256 = "1xqydvz8riz40d4q542akyxfhfq7hbhi306pcxdvbbpczyx8napp"; + version = "0.9.4"; + sha256 = "1r6gm1drfkblf6vl36z1kbjpvz5dmcjn4hnlm8r59m794palwzzk"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base Cabal containers directory extensible-exceptions filepath hint mtl process QuickCheck show simple-reflect unix ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + base Cabal containers directory extensible-exceptions filepath hint + mtl process QuickCheck show simple-reflect unix + ]; + testHaskellDepends = [ + base Cabal containers directory extensible-exceptions filepath hint + mtl process QuickCheck show simple-reflect unix + ]; description = "Safely evaluate pure Haskell expressions"; license = lib.licenses.bsd3; + mainProgram = "mueval"; }) {}; "mulang" = callPackage @@ -213204,6 +213457,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-simple-tls_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, crypton-x509, crypton-x509-store + , crypton-x509-system, crypton-x509-validation, data-default + , network, network-simple, safe-exceptions, tls + , tls-session-manager, transformers + }: + mkDerivation { + pname = "network-simple-tls"; + version = "0.4.2"; + sha256 = "0m49w5qvfx8b44a4i77zirlxa109pihmymdrr8diy62dlxwvqi5d"; + libraryHaskellDepends = [ + base bytestring crypton-x509 crypton-x509-store crypton-x509-system + crypton-x509-validation data-default network network-simple + safe-exceptions tls tls-session-manager transformers + ]; + description = "Simple interface to TLS secured network sockets"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-simple-ws" = callPackage ({ mkDerivation, async, base, bytestring, case-insensitive , network-simple, safe-exceptions, websockets @@ -214128,8 +214401,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.7.1"; - sha256 = "1ynsqhyb8y0rqj2bzwl4pffbwv2cdfxc133ic2lpprjy2hrz5pz5"; + version = "1.7.8"; + sha256 = "16a7dq92ibqi2y8dna9dyw43n52av2khp2k5jcc70bis2h90i0b2"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -214144,8 +214417,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.1.2"; - sha256 = "1vv5pl6lazbq6g11nsj6ks14by1shjplxllfi9rmij49w67q0xln"; + version = "0.5.1.3"; + sha256 = "008i34viq8cw36r46qvnwvhn13y2srpxia7r3n9bk0sjxfz6ia7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -214208,8 +214481,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.2"; - sha256 = "18jbvjziy3dakp59bhz4gx9b6w74g1y7mwcmlgmy5wc0snqx22j8"; + version = "1.2.2.1"; + sha256 = "1nl3b1i034zbm15mhhyjlgh1220xlih6i80vx4lk83pydagj9xy1"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -214228,8 +214501,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.5"; - sha256 = "0myggkgscm4yl4f9wdhpf571dz5yrdfb09ajl1ybic7yl8nmm9zq"; + version = "1.2.6"; + sha256 = "174xzifz0qmbq81gcaqnrwc14xk5jx38nygs9p2ansjsf9i4g50r"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -214625,8 +214898,8 @@ self: { }: mkDerivation { pname = "nix-freeze-tree"; - version = "0.1.0.1"; - sha256 = "050wy6jyjd720k9bndrsh19v0zl987s0s5ym0192lgsh346q1r67"; + version = "0.1.1.0"; + sha256 = "1gpck20812pdc2yfgcmc5f2cgxhi27g3587kp8d6yjvl8fbh6ydd"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -215465,8 +215738,8 @@ self: { }: mkDerivation { pname = "non-empty-text"; - version = "0.2.0"; - sha256 = "0ipbh2lmjya9zayvivy06j5rrkfdydbbr8wfnzb2h1vsnp737fhj"; + version = "0.2.1"; + sha256 = "0cvnyigmbbr3xbvh997pwb3zb0m8p1r6r9c7rxdixcdln0jy92yv"; libraryHaskellDepends = [ base deepseq text ]; testHaskellDepends = [ base deepseq doctest Glob hspec QuickCheck text @@ -215550,8 +215823,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.4"; - sha256 = "12p40gzhmggbvh466s50d6xqaz9y7d32px3yv911wdwkcs3xxkch"; + version = "0.3.4.5"; + sha256 = "0a241kdg3spbcj9ajwgwribh5pxfdix8ixp8nm4dik5wq1garskf"; libraryHaskellDepends = [ aeson base comonad containers deepseq invariant nonempty-vector semigroupoids these vector @@ -216169,8 +216442,8 @@ self: { }: mkDerivation { pname = "nqe"; - version = "0.6.4"; - sha256 = "17ymmb0sy95yf5abdgq60j9bi9pdr746ap7x0byakd3gi7kciijg"; + version = "0.6.5"; + sha256 = "0k8p8sgmw9xl9v76h817zi0dmqkf8wkh8g1h4p481f7psqj82x55"; libraryHaskellDepends = [ base conduit containers hashable mtl stm unique unliftio ]; @@ -218602,10 +218875,8 @@ self: { ({ mkDerivation, base, old-locale }: mkDerivation { pname = "old-time"; - version = "1.1.0.3"; - sha256 = "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"; - revision = "2"; - editedCabalFile = "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"; + version = "1.1.0.4"; + sha256 = "0vqn9iifrg601734pvvl3khyxv2y7dxr25z3a9pnfjljgdzyn8hy"; libraryHaskellDepends = [ base old-locale ]; description = "Time library"; license = lib.licenses.bsd3; @@ -218689,8 +218960,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "2.0.0.2"; - sha256 = "0p9g6638z693jd2gz0bq7i03zqyfq5dql5ym8jagszhdygrccy98"; + version = "2.0.0.5"; + sha256 = "0nggl62mf42q69vcjbdbkfflk4b4q6yd15sx0hkvrz1ry2ivjdqq"; libraryHaskellDepends = [ base bytestring Cabal containers directory http-types safe safe-exceptions template-haskell text unix wai @@ -218723,8 +218994,8 @@ self: { }: mkDerivation { pname = "om-fork"; - version = "0.7.1.8"; - sha256 = "1pam9jlm8c8pkljzh4b0js1p3yrp4xdwwxicy49dx33asjdxcm4h"; + version = "0.7.1.9"; + sha256 = "1892aq7yi36mimmk7lp0y25484vpi2z9lfvrkvi5gbdp1xb96n84"; libraryHaskellDepends = [ aeson base exceptions ki monad-logger om-show text unliftio ]; @@ -218743,8 +219014,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.0.4"; - sha256 = "0rwq81m251hdqs9l5zkkq8z3yd7gnpjx9cl999gs3n12s469bc0z"; + version = "0.3.0.5"; + sha256 = "1wqgv1zs8s08rh9w6g7swbd6q25vnykpig960xv8qdv66p5ngk15"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -218833,8 +219104,8 @@ self: { }: mkDerivation { pname = "om-logging"; - version = "1.1.0.4"; - sha256 = "1cpzw22klh7mq3lxwb68yw8ghc78xwc64kizbjwhzf2laazmdi3b"; + version = "1.1.0.6"; + sha256 = "1iml4g4zbdws2jq93r09q005iz4cbnk7zdqif0cbj4gpa0iqbdm7"; libraryHaskellDepends = [ aeson base bytestring fast-logger monad-logger om-show split text time @@ -218849,8 +219120,8 @@ self: { ({ mkDerivation, base, containers, ghc, safe }: mkDerivation { pname = "om-plugin-imports"; - version = "0.1.0.4"; - sha256 = "0r8iw67pid9wy8h859j92sb08camky1d12hsak2bsbiqwc10rijz"; + version = "0.1.0.5"; + sha256 = "1dz9iwiyn6x2w1f6y3y2f7l30ajg6nr2s65dphrlrd7cnf4fvpdz"; libraryHaskellDepends = [ base containers ghc safe ]; description = "Plugin-based import warnings"; license = lib.licenses.mit; @@ -219841,17 +220112,17 @@ self: { "opencascade-hs" = callPackage ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKernel, TKFillet - , TKG2d, TKG3d, TKGeomBase, TKMath, TKMesh, TKOffset, TKPrim, TKStd - , TKSTEP, TKSTL, TKTopAlgo, TKV3d + , TKG2d, TKG3d, TKGeomBase, TKMath, TKMesh, TKOffset, TKPrim + , TKService, TKStd, TKSTEP, TKSTL, TKTopAlgo, TKV3d }: mkDerivation { pname = "opencascade-hs"; - version = "0.0.0.1"; - sha256 = "1fikr8sx3qbciq2wjbfr53al172h1hw3nxq4sxc3mspqiflwmy2c"; + version = "0.1.1.1"; + sha256 = "0wfvxnyagci3gl09vrlw2lkjk6vniwc7y2zmbyl0wim03wqkc34b"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKMath TKMesh - TKOffset TKPrim TKStd TKSTEP TKSTL TKTopAlgo TKV3d + TKOffset TKPrim TKService TKStd TKSTEP TKSTL TKTopAlgo TKV3d ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; @@ -219860,7 +220131,8 @@ self: { }) {TKBO = null; TKBRep = null; TKFillet = null; TKG2d = null; TKG3d = null; TKGeomBase = null; TKMath = null; TKMesh = null; TKOffset = null; TKPrim = null; TKSTEP = null; TKSTL = null; - TKStd = null; TKTopAlgo = null; TKV3d = null; TKernel = null;}; + TKService = null; TKStd = null; TKTopAlgo = null; TKV3d = null; + TKernel = null;}; "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers @@ -221156,8 +221428,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.4.0.4"; - sha256 = "0p7q05f7xmd5y7rd35zcgyvqp8jh945qp5242vshbr875cy25dj5"; + version = "0.4.0.5"; + sha256 = "0wdlnfl39zaq9mv7xxaljxq851hp4xzmblkfpfvg4qdfhk4hn7k6"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -221536,6 +221808,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-th" = callPackage + ({ mkDerivation, base, hspec, optparse-applicative + , optparse-generic, template-haskell, text + }: + mkDerivation { + pname = "optparse-th"; + version = "0.1.0.0"; + sha256 = "1x8lqw46agnz933ymb1hshkh0ziqf6r3pwky90z8ic0wxvhv1sa5"; + libraryHaskellDepends = [ + base optparse-applicative optparse-generic template-haskell text + ]; + testHaskellDepends = [ + base hspec optparse-applicative optparse-generic template-haskell + text + ]; + description = "Like `optparse-generic`, but with `TemplateHaskell` for faster builds"; + license = lib.licenses.bsd3; + }) {}; + "optparse-version" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -222371,16 +222662,18 @@ self: { "os-string" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, QuickCheck - , random, tasty-bench, template-haskell + , quickcheck-classes-base, random, tasty-bench, template-haskell }: mkDerivation { pname = "os-string"; - version = "2.0.0"; - sha256 = "0mm2mhra424yilg7nww5dn522b5bpriahgdzvbzbv0qf1zbhxv9r"; + version = "2.0.2"; + sha256 = "18fay8gmlwskfhdikkhb21za1zpmjvsp33f9afbp2ri9jrp14lq9"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; - testHaskellDepends = [ base bytestring QuickCheck ]; + testHaskellDepends = [ + base bytestring deepseq QuickCheck quickcheck-classes-base + ]; benchmarkHaskellDepends = [ base bytestring deepseq random tasty-bench ]; @@ -222770,8 +223063,8 @@ self: { }: mkDerivation { pname = "owoify-hs"; - version = "1.0.0.1"; - sha256 = "0h7z4hsf5x9qi892sd9jx6r9vcnaskbpxhpq64vmvd2805cznyr1"; + version = "1.1.0.0"; + sha256 = "00q0jal8m2d7blmhsgjggxnb2cfx1h7bl3ymlkq55f09ygkv3nvk"; libraryHaskellDepends = [ base random regex regex-with-pcre text ]; testHaskellDepends = [ base HUnit random regex regex-with-pcre text @@ -223395,6 +223688,7 @@ self: { description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pagerduty-hs" = callPackage @@ -223657,9 +223951,9 @@ self: { ]; }) {}; - "pandoc_3_1_9" = callPackage + "pandoc_3_1_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64, binary, blaze-html, blaze-markup, bytestring + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions , commonmark-pandoc, containers, crypton-connection, data-default , deepseq, Diff, directory, doclayout, doctemplates, emojis @@ -223676,14 +223970,14 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.9"; - sha256 = "06l62xpmgr35shld3rk1r4yab4x9019fjf1vz0lajjg5jfbl6sca"; + version = "3.1.11"; + sha256 = "1ijz2n2xl7qjsbbk9h4bc4d5mxyv0yridsdk6i66ffr25hvl864w"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64 binary blaze-html - blaze-markup bytestring case-insensitive citeproc commonmark - commonmark-extensions commonmark-pandoc containers + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc containers crypton-connection data-default deepseq directory doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb @@ -223703,10 +223997,6 @@ self: { base bytestring deepseq mtl tasty-bench text ]; doHaddock = false; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; hydraPlatforms = lib.platforms.none; @@ -223788,8 +224078,8 @@ self: { }: mkDerivation { pname = "pandoc-cli"; - version = "0.1.1.1"; - sha256 = "18qvgnzcklcckfpp1ahh3g1a5pdxp8ww7qq7apdq4xl2m959fh8z"; + version = "3.1.11"; + sha256 = "0f8ny7rzl6zgicx7abr631xz2fnrpbb3n8bm6af22ady71g2rrih"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -224431,17 +224721,18 @@ self: { }) {}; "pandoc-server" = callPackage - ({ mkDerivation, aeson, base, base64, bytestring, containers - , data-default, doctemplates, pandoc, pandoc-types, servant-server - , skylighting, text, unicode-collation, wai, wai-cors + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, data-default, doctemplates, pandoc, pandoc-types + , servant-server, skylighting, text, unicode-collation, wai + , wai-cors }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.3"; - sha256 = "0g7a5yb3cdh1jaj5z3mhcp1jka5fm138d6176jkg08jh74vdydga"; + version = "0.1.0.4"; + sha256 = "101z99b06x4qx0v1dqxpggzjylvhp7g10q7cjn9ass4cfyg2am4v"; libraryHaskellDepends = [ - aeson base base64 bytestring containers data-default doctemplates - pandoc pandoc-types servant-server skylighting text + aeson base base64-bytestring bytestring containers data-default + doctemplates pandoc pandoc-types servant-server skylighting text unicode-collation wai wai-cors ]; description = "Pandoc document conversion as an HTTP servant-server"; @@ -224819,50 +225110,6 @@ self: { broken = true; }) {}; - "pantry_0_5_2_1" = 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.2.1"; - sha256 = "0g1v78mgxa6mn0vm6yii3nzfdwpn4hgrlcld1h3mbwaxn6c8116k"; - revision = "1"; - editedCabalFile = "15gyndsfckzc0iz5bhh4hbiszcyv1mp65445f4mmf6b6pfcq7qag"; - 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" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers @@ -224906,7 +225153,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_9_3" = callPackage + "pantry_0_9_3_1" = callPackage ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, base , bytestring, Cabal, casa-client, casa-types, companion, conduit , conduit-extra, containers, crypton, crypton-conduit, digest @@ -224921,8 +225168,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.9.3"; - sha256 = "1ls7cdpbq267cgdq1bj31w3vc35aq2hd3qw8ay0rmri95rwyn7k9"; + version = "0.9.3.1"; + sha256 = "17nnp3vl03bv5c4c8djyvv7w885ajypzwxwb82vza8m0cf2jyja5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229643,8 +229890,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.1.4"; - sha256 = "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d"; + version = "2.13.1.5"; + sha256 = "1dg709kz1rrgj3ir24a8pww47my03h3k5vcn2qld7h2ffcbnlxd9"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -229977,8 +230224,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.2.0"; - sha256 = "1v846ymm46b1g1bv95brrnndp7vi3qkfjdfwjqxsdi9c9hixwq87"; + version = "2.13.3.0"; + sha256 = "014ibary358yq2shi72ry56xfqzqj173al33nsmcp5z13j8m5hdx"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -230652,8 +230899,8 @@ self: { pname = "phatsort"; version = "0.6.0.0"; sha256 = "1cjmamla9383fk9715jxzlw87qnd26hpkcqhk4vvgld51nraf2pl"; - revision = "2"; - editedCabalFile = "0k8yadhps2dgfc0ba016il0lv4idfb9phz492ah6z0k42i0grffa"; + revision = "3"; + editedCabalFile = "0fjd37sigkccr9dw70z3yy8hjn7p210b5nn52lj1hf0jlks81q0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237250,8 +237497,8 @@ self: { }: mkDerivation { pname = "posit"; - version = "2022.1.0.0"; - sha256 = "19ahwh40n2kl3dm4pj7290x6xs37whfafr0lydvccg9vdydavywj"; + version = "2022.2.0.0"; + sha256 = "1637dpqfgs4mpl2n8cvzywsdwsv2zw5834k3mmxd5zhq82ai2m0q"; libraryHaskellDepends = [ base data-dword deepseq random scientific ]; @@ -237614,8 +237861,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.13.1.1"; - sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; + version = "0.13.1.2"; + sha256 = "0gdmzylx8xqsp22hxlc19cqsid64s4bfqc4g9kg16vndc2b1d6x5"; libraryHaskellDepends = [ aeson base binary-parser bytestring bytestring-strict-builder containers network-ip scientific text time transformers @@ -238327,22 +238574,19 @@ self: { "postgresql-syntax" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, hashable , headed-megaparsec, hedgehog, megaparsec, parser-combinators - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, unordered-containers + , rerebase, tasty, tasty-hunit, text, text-builder + , unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.4.1"; - sha256 = "1ls3jjgbvdy0x3110lgjd3icas187qyd31cwvi858l6ayhwf9kck"; + version = "0.4.1.1"; + sha256 = "1xzvp3ix75y8f3zwpm50dz1zafbyc0x311a2fc9dxb3v4vbcvwvl"; libraryHaskellDepends = [ base bytestring case-insensitive hashable headed-megaparsec megaparsec parser-combinators text text-builder unordered-containers ]; - testHaskellDepends = [ - hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; + testHaskellDepends = [ hedgehog rerebase tasty tasty-hunit ]; description = "PostgreSQL AST parsing and rendering"; license = lib.licenses.mit; }) {}; @@ -241357,6 +241601,8 @@ self: { pname = "process"; version = "1.6.18.0"; sha256 = "0zm3v2m95a7bsnndl1pvdj9a7gd4v84pb34rmgsqjkwpwi7lqpxa"; + revision = "1"; + editedCabalFile = "0hi7wnsi1yxx7chxbbpjlisid1slq8biw6m4bld6s6hy2njbryv9"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -243832,8 +244078,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.2.13"; - sha256 = "07j9iszxv3c0yw3lm8zlf1wl34imr3r828fc8jg047rr28yxy2kg"; + version = "0.1.2.14"; + sha256 = "025b3z6mpyb2v2jvv5x0dryghlwcz083f8721kddfyi7v0qd10vg"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog isomorphism-class numeric-limits rerebase @@ -246220,8 +246466,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.12"; - sha256 = "14jk6d0i72ry9x5k1rxy0qgvxw0sp05g03yhjsvyqchh6x9m4kb7"; + version = "0.1.13"; + sha256 = "04ncav3c5jjakasvlr8r45zgwfbb9dmikx4945afxsm0iaqryxqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247727,7 +247973,6 @@ self: { executableHaskellDepends = [ base ]; description = "A library and program to create QIF files from Rabobank CSV exports"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "rabocsv2qif"; }) {}; @@ -248830,14 +249075,12 @@ self: { ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { pname = "rapid"; - version = "0.1.4"; - sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7"; - revision = "2"; - editedCabalFile = "1v31sadig136f7jv9cj7ddj2fn1ymhiahg4hg5n8l3czsjck7qmp"; + version = "0.1.5"; + sha256 = "13nd69rjw0xdxvcqwgs9vzq93l0yiha9zqaw5is6mw20vks6akw5"; libraryHaskellDepends = [ async base containers foreign-store stm ]; - description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; + description = "Hot reload and reload-surviving values with GHCi"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -250634,7 +250877,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_20_1_1" = callPackage + "rebase_1_20_2" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -250643,8 +250886,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.20.1.1"; - sha256 = "1fwshqfshqxdjfxb9flbch40mjdjqfc3vl7q1j9b1dcv7jfyjv0h"; + version = "1.20.2"; + sha256 = "14mvgg50yy5msmqv7p8kgx5dvj27dsxpzncmgzx5237kj6l9f4h0"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -251343,7 +251586,6 @@ self: { ]; description = "REdis Serialization Protocol (RESP) implementation"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "redis-schema" = callPackage @@ -252780,8 +253022,8 @@ self: { }: mkDerivation { pname = "refurb"; - version = "0.3.0.2"; - sha256 = "09yzk37f2sbmygva12splnxj3z6sy35mz9b6s7w82s1jbvy16zgr"; + version = "0.3.0.3"; + sha256 = "14l1pr95bacxn662ankww9lwpwdg0f58m4x0k8vmalpdjzc53kg6"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring classy-prelude composite-base composite-opaleye dlist exceptions fast-logger lens monad-control @@ -255385,8 +255627,8 @@ self: { }: mkDerivation { pname = "request"; - version = "0.2.1.0"; - sha256 = "1a2zx0gb03mv6g4sw0r6pxkvih8ca5w9w44k6d3n7b5b7s8yznhk"; + version = "0.2.2.0"; + sha256 = "057x980cs826j7yjhiph6m9j33zh0nlrshfdbq4i8g887scbqgnx"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-client-tls http-types @@ -255500,12 +255742,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_20_1_1" = callPackage + "rerebase_1_20_2" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.20.1.1"; - sha256 = "1rwqk72y0ky8xc3r5j1f04f8a7g37l8j5ybcadxf0wsbnhnz0lli"; + version = "1.20.2"; + sha256 = "0c6ba9cvs2bq9yswys7xl6vl03bn3fm7b5iar5wpqd0aii2qqnps"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -255884,6 +256126,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "resourcet-extra" = callPackage + ({ mkDerivation, base, containers, resourcet, safe-exceptions }: + mkDerivation { + pname = "resourcet-extra"; + version = "0.0.1"; + sha256 = "09kgzdg3g1lsadgrqaj9dviwap8j3zv2rm1yby9ywxx6zdbglrrw"; + libraryHaskellDepends = [ + base containers resourcet safe-exceptions + ]; + description = "ResourceT extras"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "resourcet-pool" = callPackage ({ mkDerivation, base, resource-pool, resourcet }: mkDerivation { @@ -259584,6 +259841,8 @@ self: { description = "Let your mind know that your hands need a rest!"; license = lib.licenses.bsd2; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rspp" = callPackage @@ -260240,15 +260499,15 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.6.7"; - sha256 = "1k7ngvdsn59q7b7j9q1cfm1r6vwxqhbaal7qnxy0r9y6vcc6ggxf"; + version = "0.7.1"; + sha256 = "14jfpr5dl6fwkz3zydi3mwdrs08rbhasxz0mwhqy3vp4x5vw22m2"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ aeson array base bifunctors bytestring co-log-core data-default-class directory filepath Glob lens lsp lsp-types mtl - optparse-generic stm template-haskell text yaml + stm template-haskell text yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ @@ -260258,7 +260517,7 @@ self: { executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ array base bifunctors bytestring directory doctest Glob mtl - optparse-generic QuickCheck template-haskell text yaml + QuickCheck template-haskell text yaml ]; testToolDepends = [ alex BNFC happy ]; description = "An experimental proof assistant for synthetic ∞-categories"; @@ -260405,8 +260664,8 @@ self: { }: mkDerivation { pname = "safe-coloured-text-gen"; - version = "0.0.0.1"; - sha256 = "1h2n6qvggrzrqfbi9633kjzmlpgqf4anbqzip6l3ygj5p1lk69zb"; + version = "0.0.0.2"; + sha256 = "09ggxr8r3qynk5vyg52j4pyq4qp3mwfigzp837agxgkv3bxb3638"; libraryHaskellDepends = [ base genvalidity genvalidity-bytestring genvalidity-text safe-coloured-text @@ -262212,7 +262471,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_5_0_1" = callPackage + "sbp_5_0_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -262221,8 +262480,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "5.0.1"; - sha256 = "0nld66iq1jdi5zj9zzixvs2mmdkw3drq5pgmwhnw4rfhwdz0vkc4"; + version = "5.0.4"; + sha256 = "1wfv99haslzjb7bl43a30z4m1gp0d83xayy7a5f4x447v6g9l8cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262571,8 +262830,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.6.2.1"; - sha256 = "0w3l38czfsgbyd3x6yir7qw9bl8nmhclrbpbwfyhs39728jlscnc"; + version = "0.6.2.2"; + sha256 = "0cv43mf4sb3yii2dnv3pxqwlq31m0k39vqahqww9bjphqzny5ms5"; libraryHaskellDepends = [ base bytestring case-insensitive data-default http-client http-client-tls scalpel-core tagsoup text @@ -262588,8 +262847,8 @@ self: { }: mkDerivation { pname = "scalpel-core"; - version = "0.6.2.1"; - sha256 = "1yl1lsi5xm3qdlww2sb6vyppjiisj54f4yzvffv3qg8dgkfjfdra"; + version = "0.6.2.2"; + sha256 = "07byri7i3mz04axlxbrbiavm6yqigii9xw8fbyf2944xph564dba"; libraryHaskellDepends = [ base bytestring containers data-default fail mtl pointedlist regex-base regex-tdfa tagsoup text transformers vector @@ -263443,20 +263702,18 @@ self: { license = lib.licenses.bsd3; }) {}; - "scotty_0_20_1" = callPackage + "scotty_0_21" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring - , case-insensitive, cookie, data-default-class, directory - , exceptions, hspec, hspec-discover, hspec-wai, http-types - , lifted-base, lucid, monad-control, mtl, network, regex-compat - , stm, text, time, transformers, transformers-base + , case-insensitive, cookie, data-default-class, directory, doctest + , exceptions, hspec, hspec-discover, hspec-wai, http-client + , http-types, lifted-base, lucid, monad-control, mtl, network + , regex-compat, stm, text, time, transformers, transformers-base , transformers-compat, unliftio, wai, wai-extra, warp, weigh }: mkDerivation { pname = "scotty"; - version = "0.20.1"; - sha256 = "1770kj78zdi137pskiyx28id64vilmhylnkgy139pvxa95n8i6kd"; - revision = "1"; - editedCabalFile = "02gz7kgv273scgmig0qkvfynslhqg9pnhmablidr47kw80kqghy6"; + version = "0.21"; + sha256 = "1qnyagwirxcmja3wbiyp5s8f0dvcdiz7fh0a6jc4vyj2yy175yi4"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive cookie data-default-class exceptions http-types monad-control mtl network @@ -263464,8 +263721,8 @@ self: { transformers-compat unliftio wai wai-extra warp ]; testHaskellDepends = [ - async base bytestring directory hspec hspec-wai http-types - lifted-base network text wai + async base bytestring directory doctest hspec hspec-wai http-client + http-types lifted-base network text wai ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -265663,10 +265920,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.11.4"; - sha256 = "1i2i0w18l2ysambyylv93jzy0adiiqwwnhg7zagqb7p2srybxc3k"; - revision = "1"; - editedCabalFile = "0276l0b49b4y4z9dy5a5i7182678vv1flmkhiw1a4jsbmc4mrfgm"; + version = "0.7.11.5"; + sha256 = "0b0rzry82yyy96kb9aywlggna721bhzvx8af5s6say6ssm7hwsad"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -266504,6 +266759,35 @@ self: { mainProgram = "image-conversion"; }) {}; + "servant-aeson-generics-typescript" = callPackage + ({ mkDerivation, aeson, aeson-generics-typescript, async, base + , bytestring, containers, directory, filepath, hspec, hspec-wai + , http-types, jose-jwt, process, QuickCheck, random, servant + , servant-auth, servant-server, split, string-interpolate, text + , time, warp + }: + mkDerivation { + pname = "servant-aeson-generics-typescript"; + version = "0.0.0.1"; + sha256 = "164f9c22lbyv670ci8yxknpas1gi4yswdpkq20ls4nnq7jsa3zi5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-generics-typescript base containers http-types jose-jwt + servant string-interpolate text + ]; + executableHaskellDepends = [ + aeson aeson-generics-typescript async base bytestring containers + directory filepath hspec hspec-wai http-types jose-jwt process + QuickCheck random servant servant-auth servant-server split + string-interpolate text time warp + ]; + description = "Generates a TypeScript client for Servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "tests"; + }) {}; + "servant-aeson-specs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery @@ -267805,8 +268089,8 @@ self: { }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.5"; - sha256 = "1vpa699lrx20309z0brqlbiqn1mwjjqgb5k5nwxgqm67p8k3y0sx"; + version = "0.1.6"; + sha256 = "19w7kg39mzrzir8l0qism3zqjgln7wa02zzbdk9swwnfcja8xm1h"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers cryptonite http-client http-types memory mtl servant servant-client @@ -268194,6 +268478,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "mock-app"; + broken = true; }) {}; "servant-multipart" = callPackage @@ -268420,8 +268705,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.5.0"; - sha256 = "1ia17r5mlm20cdiswh95q4mbm6kgsjba1vpzyh07yfz998dax6y3"; + version = "2.5.1"; + sha256 = "09kz1dznwmv560zyyqh9n71cfvw8xdkclqg5fyknjyiqva56xpnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268565,8 +268850,8 @@ self: { }: mkDerivation { pname = "servant-prometheus"; - version = "1.1.0"; - sha256 = "0sykw9b5pkrccf4kdggg941dpafjfxsh0854f0v92c3582nr5xbq"; + version = "1.2.0"; + sha256 = "1jgbmrf1g85zsvy446b5ckwr1q3qm8gigybbf8vvd26wa3fxbbjp"; libraryHaskellDepends = [ base clock ghc-prim hashable http-types prometheus-client servant text wai @@ -271233,6 +271518,8 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shake-google-closure-compiler" = callPackage @@ -273376,8 +273663,8 @@ self: { }: mkDerivation { pname = "simple-cairo"; - version = "0.1.0.5"; - sha256 = "1r11gwvx0qssmv99scsblqys450aq8aq1p4vs424s1wv1j59afl3"; + version = "0.1.0.6"; + sha256 = "08w3q6mln3xmd8hjkaaw0j0djcyxc9wnrwangd6p5ajp3zdf26wb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring c-struct cairo-image exception-hierarchy primitive @@ -273390,7 +273677,6 @@ self: { ]; description = "Binding to Cairo library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo;}; "simple-cmd" = callPackage @@ -273879,6 +274165,7 @@ self: { description = "Binding to Pango library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) pango;}; "simple-parser" = callPackage @@ -277524,8 +277811,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.3.0"; - sha256 = "0r21fmmhn90rjvgxmlcq5f1q8dxd1y2zr62z2llcnl206a2hpm2x"; + version = "0.12.3.1"; + sha256 = "04prc1gbir7kyakqb71mj1x3lxl09n2lybb2df7ksczv96qg6dsx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -282745,14 +283032,14 @@ self: { mainProgram = "stack-clean-old"; }) {}; - "stack-clean-old_0_5" = callPackage + "stack-clean-old_0_5_1" = callPackage ({ mkDerivation, base, directory, extra, filemanip, filepath , simple-cmd, simple-cmd-args, simple-prompt }: mkDerivation { pname = "stack-clean-old"; - version = "0.5"; - sha256 = "1d2hgn6f39iy4sw4zqalzc804f2463y99j9p8vzlr6bckan2krx3"; + version = "0.5.1"; + sha256 = "0crk2pqfsjqd386ggg0i6nx2nd0an50y9vglwix184s7mry7yzvm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -283604,14 +283891,12 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.0.2"; - sha256 = "03zalyk0ickp9acfi6s869h4p3a7djpzpiwsp3nlhwhbdv2si9q4"; - revision = "1"; - editedCabalFile = "1dhcx7q4n4yrp9kxqzwha5spzxfqqzwax43gw82ncdh1ykinjgyb"; + version = "0.1.1.0"; + sha256 = "0w5i4xfzgbsfv3yzl0j9wzqwyi2z4ynfkrqsa4lnbxrf0xnmnazn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base64 blaze-html bytestring clay colourista + array base base64 blaze-html bytestring clay colourista containers cryptohash-sha1 dir-traverse directory extensions filepath ghc ghc-boot-th gitrev microaeson optparse-applicative pretty-simple process relude slist text tomland trial trial-optparse-applicative @@ -283625,9 +283910,7 @@ self: { doHaddock = false; description = "Haskell STatic ANalyser"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "stan"; - broken = true; }) {}; "standalone-derive-topdown" = callPackage @@ -286338,6 +286621,8 @@ self: { pname = "streamly"; version = "0.10.0"; sha256 = "0mpgi3pz4xbqrzidsp2gbn4wcqfvi5nhry41sxx1rfjg6lyn9r6g"; + revision = "1"; + editedCabalFile = "0jas47x44iiylfzrx1wvmnf0w9nnr95h1gdn5bnswjr50xcyg01d"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions hashable heaps lockfree-queue monad-control mtl network @@ -286458,21 +286743,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "streamly-core_0_2_0" = callPackage + "streamly-core_0_2_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , fusion-plugin-types, ghc-bignum, ghc-prim, heaps, monad-control , template-haskell, transformers, unix }: mkDerivation { pname = "streamly-core"; - version = "0.2.0"; - sha256 = "09146gbkg0w0cdb30y498lipqyywjb3r5pmyv4w83cxpfyvq1qlz"; + version = "0.2.1"; + sha256 = "1zal66xpamh07xk8vx6ibxg9cz1a7s0hry31lyqr3nimk26c1zbs"; libraryHaskellDepends = [ base containers directory exceptions filepath fusion-plugin-types ghc-bignum ghc-prim heaps monad-control template-haskell transformers unix ]; - description = "Streaming, parsers, arrays and more"; + description = "Streaming, parsers, arrays, serialization and more"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -286498,6 +286783,28 @@ self: { license = lib.licenses.asl20; }) {}; + "streamly-examples_0_2_0" = callPackage + ({ mkDerivation, base, containers, directory, exceptions + , fusion-plugin, hashable, mtl, network, random, streamly + , streamly-core, tasty-bench, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "streamly-examples"; + version = "0.2.0"; + sha256 = "0m2mzsbijd11hxq6kvsd61700ndvj58qdixvp7mkdrvb7pw5jf4q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory exceptions fusion-plugin hashable mtl + network random streamly streamly-core tasty-bench transformers + transformers-base unordered-containers vector + ]; + description = "Examples for Streamly"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "streamly-fsnotify" = callPackage ({ mkDerivation, base, filepath, fsnotify, semirings, streamly , text, time @@ -290346,8 +290653,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.4.0.1"; - sha256 = "1bw33c71ra3m1wslmmclqkwnac9vbi871qigir5y4fr1p2arjgrn"; + version = "0.4.0.2"; + sha256 = "0qlm0plp3kr57g43li9g3maicxsidx31bvmxkng1q0s7cwzq3wma"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -293562,6 +293869,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "tar_0_6_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, file-embed, filepath, QuickCheck, tasty, tasty-bench + , tasty-quickcheck, temporary, time + }: + mkDerivation { + pname = "tar"; + version = "0.6.0.0"; + sha256 = "11hr2p0lrdkklvn7yf85cqhyzq4ax2lxsfg0rljakkrpnn7s0n44"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath time + ]; + testHaskellDepends = [ + array base bytestring containers deepseq directory file-embed + filepath QuickCheck tasty tasty-quickcheck temporary time + ]; + benchmarkHaskellDepends = [ + array base bytestring containers deepseq directory filepath + tasty-bench temporary time + ]; + doHaddock = false; + description = "Reading, writing and manipulating \".tar\" archive files."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tar-bytestring" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-handle , containers, criterion, deepseq, hpath-directory, hpath-filepath @@ -293705,6 +294038,8 @@ self: { pname = "tart"; version = "0.3"; sha256 = "0zqj8cz4q1447an9fak73vzandd497xa745km3w4y3cffnc0zwyw"; + revision = "1"; + editedCabalFile = "0n8l43anikll6l81rmm5y7qj6rmzmnr502n00qyzz2jqwgygdrzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295948,8 +296283,8 @@ self: { }: mkDerivation { pname = "templatise"; - version = "0.1.0.3"; - sha256 = "0fxwmvyr9rslr0jbji98xhz2zdk46xznnhavzfa0d3nl4kglkp1q"; + version = "0.1.1.0"; + sha256 = "1vkqnb0h7gqrm50vndrg4xz1g5izzn93wbmkcsy3wrb99isl4yj4"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -297749,6 +298084,30 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_8_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, typst-symbols, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.8.6"; + sha256 = "17fs83q1wb2s8j8ia5c36108wibm8pvdqhz4zcflvdivml3pm8vv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text + typst-symbols xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -299339,10 +299698,8 @@ self: { }: mkDerivation { pname = "th-extras"; - version = "0.0.0.6"; - sha256 = "0jkwy2kqdqmq3qmfy76px2pm8idxgs18x1k1dzpsccq21ja27gq2"; - revision = "1"; - editedCabalFile = "0v81vfgaky4bb3rh18mnb7ampwm43dba3vsngv9mb1f3z975f0ix"; + version = "0.0.0.7"; + sha256 = "0zxbqmdzrljjcj5dh2yi0hgjjd6a3wyg2r989vvcsdfxfcb0dl46"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -299475,20 +299832,18 @@ self: { }) {}; "th-lego" = callPackage - ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , template-haskell-compat-v0208, text + ({ mkDerivation, base, rerebase, tasty, tasty-hunit + , template-haskell, template-haskell-compat-v0208, text }: mkDerivation { pname = "th-lego"; - version = "0.3.0.2"; - sha256 = "1w7z6g0sfn23yaqjpylnf1kpwyyf9ka17f0bqvlxcd3b739ajg8z"; + version = "0.3.0.3"; + sha256 = "0pvlccvbr61h1fn16bqq72vmkivxxfsfx53qyl5gzfja7r4jzflj"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck template-haskell + rerebase tasty tasty-hunit template-haskell ]; description = "Template Haskell construction utilities"; license = lib.licenses.mit; @@ -300823,8 +301178,8 @@ self: { pname = "tidal"; version = "1.9.4"; sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; - revision = "2"; - editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2"; + revision = "3"; + editedCabalFile = "0sxx6cnlhjmiccmfpjkfrisxxbghbacip0q372i66a32wwkg9i0h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -300842,8 +301197,8 @@ self: { ({ mkDerivation, base, system-cxx-std-lib }: mkDerivation { pname = "tidal-link"; - version = "1.0.1"; - sha256 = "0s3x73zx4rxjawcf2744z9dr05j4pabbxddrz9814h1d61q2cbb1"; + version = "1.0.2"; + sha256 = "1lvyfnj2mazzrh0clzxxixmvdhyy7dmfcqm9hnmikizinrh6fprp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base system-cxx-std-lib ]; @@ -301607,8 +301962,8 @@ self: { pname = "timeline"; version = "0.1.0.0"; sha256 = "0ya56j51vgg380yylpakfgr5srv20ybiyy7yhfyxz21sdgz7f168"; - revision = "4"; - editedCabalFile = "0ahcy6rl6zgfmp6k0rcrbbbrvd1wwaf59az8r4rhq3bz7naaispj"; + revision = "5"; + editedCabalFile = "07dfsj2p0qzq4r5zzljj70jhrd3y9i3wk8kb66bafbxkbjy0ggam"; libraryHaskellDepends = [ base containers hedgehog indexed-traversable semigroupoids template-haskell text th-compat time @@ -302218,32 +302573,30 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bimap, binary , bytestring, constraints-extras, containers, data-default , data-ordlist, deepseq, dependent-map, dependent-sum - , dependent-sum-template, extra, filepath, hashable, hspec - , hspec-contrib, HUnit, ilist, lens, linear, listsafe, MonadRandom - , mtl, patch, pretty-simple, random-shuffle, ref-tf, reflex - , reflex-potatoes, reflex-test-host, relude, semialign, text - , text-icu, these, vector, vty + , dependent-sum-template, extra, filepath, hspec, hspec-contrib + , hspec-discover, HUnit, ilist, lens, linear, mtl, pretty-simple + , ref-tf, reflex, reflex-potatoes, reflex-test-host, relude + , semialign, text, text-icu, these, vector, vty }: mkDerivation { pname = "tinytools"; - version = "0.1.0.5"; - sha256 = "15f0i636pc09q9wi5dh9wccrfm6widaa3hd80np81qxr1rkx3fxd"; + version = "0.1.0.6"; + sha256 = "0n69x1fk82pmhfn67r7i8xipxp4jqj3m1wy7n5b7garq3gwj5k4c"; libraryHaskellDepends = [ aeson aeson-pretty base bimap binary bytestring constraints-extras containers data-default data-ordlist deepseq dependent-map - dependent-sum dependent-sum-template extra filepath hashable ilist - lens linear listsafe MonadRandom mtl patch pretty-simple - random-shuffle ref-tf reflex reflex-potatoes reflex-test-host - relude semialign text text-icu these vector vty + dependent-sum dependent-sum-template extra filepath ilist lens + linear mtl pretty-simple ref-tf reflex reflex-potatoes + reflex-test-host relude semialign text text-icu these vector vty ]; testHaskellDepends = [ aeson base bimap binary bytestring constraints-extras containers data-default data-ordlist deepseq dependent-map dependent-sum - dependent-sum-template extra hashable hspec hspec-contrib HUnit - ilist lens linear listsafe MonadRandom mtl patch pretty-simple - random-shuffle ref-tf reflex reflex-potatoes reflex-test-host - relude semialign text text-icu these vector vty + dependent-sum-template extra hspec hspec-contrib HUnit ilist lens + linear mtl pretty-simple ref-tf reflex reflex-potatoes + reflex-test-host relude semialign text text-icu these vector vty ]; + testToolDepends = [ hspec-discover ]; description = "tinytools is a monospace unicode diagram editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -303532,8 +303885,8 @@ self: { }: mkDerivation { pname = "toml-parser"; - version = "1.3.1.0"; - sha256 = "1rqa67cg0rafh4dzbqg46znlk1f9rb59pz078q2w0b67d64lg8fa"; + version = "1.3.1.1"; + sha256 = "0gh86i6z98zdpy7i4vh66jnivd440hg552a103zkfyg7qsfprmwh"; libraryHaskellDepends = [ array base containers prettyprinter text time transformers ]; @@ -309581,8 +309934,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.3.2.1"; - sha256 = "0if1ig1ha65jp1l1v6bn5ljaa3n688hyfkq65dypj5s3nwfr0skm"; + version = "0.5"; + sha256 = "01hmb835hig6igyhpyrxxmprd9azfqbkjcnw5pfcjy099v1ik5c4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309666,7 +310019,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens thyme time timezone-olson timezone-series ]; - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; description = "Efficient time zone handling"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.maralorn ]; @@ -312281,8 +312633,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7"; - sha256 = "0gif7y2jvfd1pilli7kbljnmipzp0596mjh1by8qydppw1wwlx9b"; + version = "0.7.1"; + sha256 = "0gz30f4g3gyjz60jbcg072ms67pwdn4by6wvdkg63hjshgl0cj60"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -314440,9 +314792,13 @@ self: { pname = "uu-tc-error"; version = "0.2.0.0"; sha256 = "045xs8jlcqnfbvlbm95a5y9iqqam9gy2nfx4q9r0jdlq9i6fv2rf"; + revision = "1"; + editedCabalFile = "1dpa12gzz664yji95z9zc1y7prvz67a5fdcamd2vnjj2zww4hpjq"; libraryHaskellDepends = [ base uu-tc-error-error ]; description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "uu-tc-error-error" = callPackage @@ -314450,8 +314806,8 @@ self: { }: mkDerivation { pname = "uu-tc-error-error"; - version = "0.1.0.0"; - sha256 = "1xhngmknpvixhdfyljmm3qfmiyn603qwqgqkn05aably7v15iq0x"; + version = "0.2.0.0"; + sha256 = "1hwpkl54s7qrz15as266izcgicp92afz0vnwbd67ichj7vvwv4q0"; libraryHaskellDepends = [ base bytestring containers deepseq mtl text ]; @@ -316062,17 +316418,17 @@ self: { }) {}; "vector-builder" = callPackage - ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, attoparsec, base, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "vector-builder"; - version = "0.3.8.4"; - sha256 = "0gc2n5j1ca07hd50shy7l5xybs1y720zrarzs5dj74dsdcpvmjxw"; + version = "0.3.8.5"; + sha256 = "0c0crnqkqzx06l4xlzb4s0fdmxgjg2fjq1mllxn0vyh84pfgkfm0"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ - attoparsec QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck + attoparsec quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck ]; description = "Vector builder"; license = lib.licenses.mit; @@ -316270,8 +316626,8 @@ self: { }: mkDerivation { pname = "vector-hashtables"; - version = "0.1.1.3"; - sha256 = "0hi37svcw1z36xmjfx0s8lh2aj7ky9az0g6v4k1wn7c785bccbv6"; + version = "0.1.1.4"; + sha256 = "0nvi9j18v8xfb3p2q65bi9f3rzrw2bc2nz2q096flxjf72ipapac"; libraryHaskellDepends = [ base hashable primitive vector ]; testHaskellDepends = [ base containers hashable hspec primitive QuickCheck @@ -318421,8 +318777,8 @@ self: { }: mkDerivation { pname = "wai"; - version = "3.2.3"; - sha256 = "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m"; + version = "3.2.4"; + sha256 = "153dpwrspanvcz6dg29ixfbx343n7k071lcjf1v7qvc8gn28y256"; libraryHaskellDepends = [ base bytestring http-types network text vault ]; @@ -318832,23 +319188,21 @@ self: { "wai-handler-hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hal, http-types, network, pretty-simple, tasty - , tasty-discover, tasty-golden, text, unordered-containers, vault - , wai + , tasty-discover, tasty-golden, tasty-hunit, text + , unordered-containers, vault, wai }: mkDerivation { pname = "wai-handler-hal"; - version = "0.2.0.0"; - sha256 = "1skmwcs048h60nxq2wz2amaj148g1a6zk4vbnl17h6xi28s603lx"; - revision = "1"; - editedCabalFile = "0kdn4iv5fb0l4w4j2v4g9pyr2n56v4531k4xahysd2l034dyf6l7"; + version = "0.3.0.0"; + sha256 = "1chpg8vlyly7fmcg862j043mgnv8g5azs89nds9h0nvxalwvgnpn"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive hal - http-types network pretty-simple tasty tasty-golden text - unordered-containers vault wai + http-types network pretty-simple tasty tasty-golden tasty-hunit + text unordered-containers vault wai ]; testToolDepends = [ tasty-discover ]; description = "Wrap WAI applications to run on AWS Lambda"; @@ -319899,6 +320253,7 @@ self: { description = "WAI request predicates"; license = "unknown"; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-problem-details" = callPackage @@ -320768,6 +321123,8 @@ self: { pname = "warp-quic"; version = "0.0.0"; sha256 = "01w9rssp8a5yhc5w2y3mn3ihbnpvannl4q2rmjvphnqr5lj556sp"; + revision = "1"; + editedCabalFile = "113cbaw6gm61cjhhky5r3n4jmj75lmyj4f1rrpij81avkspc7syx"; libraryHaskellDepends = [ base bytestring http3 quic tls wai warp ]; @@ -320982,8 +321339,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.0.0.1"; - sha256 = "03a7az74sww1s6j1ppghhzszjj34z1v3sv96vh7rngw08bwslsyf"; + version = "0.1.1.1"; + sha256 = "0cv91x4z39b2rp5fwg7wqjbwkcmma66fznsqbbnr253036yy5p5b"; libraryHaskellDepends = [ base lattices lens linear opencascade-hs resourcet ]; @@ -320998,8 +321355,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.0.0.1"; - sha256 = "0ry2gdhppkgcx724lnky3j4am0x5kcxi45a1abp4bpgvqy356yps"; + version = "0.1.1.1"; + sha256 = "05jigwrcsxh6mh7b2qvb4h6nkhcb3lkhf9j7djzr1k428k290iky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -322302,7 +322659,6 @@ self: { ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "webidl" = callPackage @@ -329119,8 +329475,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.17"; - sha256 = "0bk0h65fwlg96q5vzmf07gr68wrsd06xrdxi9s7irvzyzlk0zh7q"; + version = "0.1.0.18"; + sha256 = "0azmvi13znbyr3m0qzj9ijrqvl6pzkbskk9f7kr8gmhw31aid59v"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -329286,8 +329642,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.5"; - sha256 = "154k37qydkch91khxd52mfa6jv2k6gcxyiypcsnx3hcp88mfr9pm"; + version = "0.14.6"; + sha256 = "0gcb5wrgsi025dnmjaqzmg589nghfb6fwlp2yq71g9c2csbl1fai"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -333324,8 +333680,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.23.0.0"; - sha256 = "1paa00ra9ib7whga6rgqnk1ib7jpm7rmrcs5f4sy3ykg1m9n57jc"; + version = "0.24.0.1"; + sha256 = "09xib3n7mmxcv0pknrp2xkbrr7lccsmbadx613mr7arcgf1n2a77"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/julia-modules/tests/.gitignore b/pkgs/development/julia-modules/tests/.gitignore new file mode 100644 index 0000000000000..07d2f69d765b2 --- /dev/null +++ b/pkgs/development/julia-modules/tests/.gitignore @@ -0,0 +1,3 @@ +test_runs/ +.stack-work/ +*~ diff --git a/pkgs/development/julia-modules/tests/README.md b/pkgs/development/julia-modules/tests/README.md new file mode 100644 index 0000000000000..1be3487161e64 --- /dev/null +++ b/pkgs/development/julia-modules/tests/README.md @@ -0,0 +1,25 @@ + +# Testing `julia.withPackages` + +This folder contains a test suite for ensuring that the top N most popular Julia packages (as measured by download count) work properly. The key parts are + +* `top-julia-packages.nix`: an impure derivation for fetching Julia download data and processing it into a file called `top-julia-packages.yaml`. This YAML file contains an array of objects with fields "name", "uuid", and "count", and is sorted in decreasing order of count. +* `julia-top-n`: a small Haskell program which reads `top-julia-packages.yaml` and builds a `julia.withPackages` environment for each package, with a nice interactive display and configurable parallelism. It also tests whether evaluating `using <package-name>` works in the resulting environment. + +> **Warning:** +> These tests should only be run on maintainer machines, not Hydra! `julia.withPackages` uses IFD, which is not allowed in Hydra. + +## Quick start + +``` shell +# Test the top 100 Julia packages +./run_tests.sh -n 100 +``` + +## Options + +You can run `./run_tests.sh --help` to see additional options for the test harness. The main ones are + +* `-n`/`--top-n`: how many of the top packages to build (default: 100). +* `-p`/`--parallelism`: how many builds to run at once (default: 10). +* `-c`/`--count-file`: path to `top-julia-packages.yaml`. diff --git a/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs new file mode 100644 index 0000000000000..ed9f8d405b12c --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs @@ -0,0 +1,89 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE ViewPatterns #-} + +module Main (main) where + +import Control.Exception +import Control.Monad +import Data.Aeson as A hiding (Options, defaultOptions) +import qualified Data.Aeson.Key as A +import qualified Data.Aeson.KeyMap as HM +import qualified Data.ByteString.Lazy.Char8 as BL8 +import qualified Data.List as L +import Data.Text as T +import qualified Data.Vector as V +import qualified Data.Yaml as Yaml +import GHC.Generics +import Options.Applicative +import System.Exit +import System.FilePath +import Test.Sandwich hiding (info) +import UnliftIO.MVar +import UnliftIO.Process + + +data Args = Args { + countFilePath :: FilePath + , topN :: Int + , parallelism :: Int + } + +argsParser :: Parser Args +argsParser = Args + <$> strOption (long "count-file" <> short 'c' <> help "YAML file containing package names and counts") + <*> option auto (long "top-n" <> short 'n' <> help "How many of the top packages to build" <> showDefault <> value 100 <> metavar "INT") + <*> option auto (long "parallelism" <> short 'p' <> help "How many builds to run at once" <> showDefault <> value 10 <> metavar "INT") + +data NameAndCount = NameAndCount { + name :: Text + , count :: Int + , uuid :: Text + } deriving (Show, Eq, Generic, FromJSON) + +newtype JuliaPath = JuliaPath FilePath + deriving Show + +julia :: Label "julia" (MVar (Maybe JuliaPath)) +julia = Label + +main :: IO () +main = do + clo <- parseCommandLineArgs argsParser (return ()) + let Args {..} = optUserOptions clo + + namesAndCounts :: [NameAndCount] <- Yaml.decodeFileEither countFilePath >>= \case + Left err -> throwIO $ userError ("Couldn't decode names and counts YAML file: " <> show err) + Right x -> pure x + + runSandwichWithCommandLineArgs' defaultOptions argsParser $ + describe ("Building environments for top " <> show topN <> " Julia packages") $ + parallelN parallelism $ + forM_ (L.take topN namesAndCounts) $ \(NameAndCount {..}) -> + introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do + it "Builds" $ do + let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr" + , "with import ../../../../. {}; julia.withPackages [\"" <> T.unpack name <> "\"]" + ] + output <- readCreateProcessWithLogging cp "" + juliaPath <- case A.eitherDecode (BL8.pack output) of + Right (A.Array ((V.!? 0) -> Just (A.Object (aesonLookup "outputs" -> Just (A.Object (aesonLookup "out" -> Just (A.String t))))))) -> pure (JuliaPath ((T.unpack t) </> "bin" </> "julia")) + x -> expectationFailure ("Couldn't parse output: " <> show x) + + getContext julia >>= flip modifyMVar_ (const $ return (Just juliaPath)) + + it "Uses" $ do + getContext julia >>= readMVar >>= \case + Nothing -> expectationFailure "Build step failed." + Just (JuliaPath juliaPath) -> do + let cp = proc juliaPath ["-e", "using " <> T.unpack name] + createProcessWithLogging cp >>= waitForProcess >>= (`shouldBe` ExitSuccess) + +aesonLookup :: Text -> HM.KeyMap v -> Maybe v +aesonLookup = HM.lookup . A.fromText diff --git a/pkgs/development/julia-modules/tests/julia-top-n/default.nix b/pkgs/development/julia-modules/tests/julia-top-n/default.nix new file mode 100644 index 0000000000000..ab8ed948e1ea9 --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/default.nix @@ -0,0 +1,16 @@ +{ mkDerivation, aeson, base, filepath, lib, optparse-applicative +, sandwich, text, unliftio, yaml +}: +mkDerivation { + pname = "julia-top-n"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base filepath optparse-applicative sandwich text unliftio + yaml + ]; + license = lib.licenses.bsd3; + mainProgram = "julia-top-n-exe"; +} diff --git a/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal b/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal new file mode 100644 index 0000000000000..834adac33f16a --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal @@ -0,0 +1,34 @@ +cabal-version: 2.2 + +-- This file has been generated from package.yaml by hpack version 0.36.0. +-- +-- see: https://github.com/sol/hpack + +name: julia-top-n +version: 0.1.0.0 +author: Tom McLaughlin +maintainer: tom@codedown.io +license: BSD-3-Clause +build-type: Simple + +executable julia-top-n-exe + main-is: Main.hs + other-modules: + Paths_julia_top_n + autogen-modules: + Paths_julia_top_n + hs-source-dirs: + app + ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N + build-depends: + aeson + , base >=4.7 && <5 + , bytestring + , filepath + , optparse-applicative + , sandwich + , text + , unliftio + , vector + , yaml + default-language: Haskell2010 diff --git a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml new file mode 100644 index 0000000000000..ffb9ab1d12ea4 --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml @@ -0,0 +1,37 @@ +name: julia-top-n +version: 0.1.0.0 +license: BSD-3-Clause +author: "Tom McLaughlin" +maintainer: "tom@codedown.io" + +dependencies: +- aeson +- base >= 4.7 && < 5 +- bytestring +- filepath +- optparse-applicative +- sandwich +- text +- unliftio +- vector +- yaml + +ghc-options: +- -Wall +- -Wcompat +- -Widentities +- -Wincomplete-record-updates +- -Wincomplete-uni-patterns +- -Wmissing-export-lists +- -Wmissing-home-modules +- -Wpartial-fields +- -Wredundant-constraints + +executables: + julia-top-n-exe: + main: Main.hs + source-dirs: app + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N diff --git a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml new file mode 100644 index 0000000000000..28bbc5a5f7eff --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml @@ -0,0 +1,11 @@ + +resolver: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml + +packages: +- . + +nix: + pure: false + packages: + - zlib diff --git a/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml.lock b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml.lock new file mode 100644 index 0000000000000..3e782d80cc436 --- /dev/null +++ b/pkgs/development/julia-modules/tests/julia-top-n/stack.yaml.lock @@ -0,0 +1,13 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca + size: 714097 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml + original: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml diff --git a/pkgs/development/julia-modules/tests/process_top_n.py b/pkgs/development/julia-modules/tests/process_top_n.py new file mode 100755 index 0000000000000..90de70ccec4d4 --- /dev/null +++ b/pkgs/development/julia-modules/tests/process_top_n.py @@ -0,0 +1,33 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ pyyaml toml ])" + +import csv +from pathlib import Path +import sys +import toml +import yaml + +requests_csv_path = Path(sys.argv[1]) +registry_path = Path(sys.argv[2]) + +# Generate list of tuples (UUID, count) +rows = [] +with open(requests_csv_path) as f: + reader = csv.reader(f) + for row in reader: + if row[2] == "user": + # Get UUID and request_count + rows.append((row[0], int(row[4]))) +rows.sort(key=(lambda x: x[1]), reverse=True) + +# Build a map from UUID -> name +registry = toml.load(registry_path / "Registry.toml") +uuid_to_name = {k: v["name"] for k, v in registry["packages"].items()} + +results = [] +for (uuid, count) in rows: + name = uuid_to_name.get(uuid) + if not name: continue + results.append({ "uuid": uuid, "name": uuid_to_name.get(uuid), "count": count }) + +yaml.dump(results, sys.stdout, default_flow_style=False) diff --git a/pkgs/development/julia-modules/tests/run_tests.sh b/pkgs/development/julia-modules/tests/run_tests.sh new file mode 100755 index 0000000000000..c7537c801d98b --- /dev/null +++ b/pkgs/development/julia-modules/tests/run_tests.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p jq + +set -eo pipefail + +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $SCRIPTDIR + +TOP_N_FILE=$(nix build --impure -f top-julia-packages.nix --no-link --json | jq -r '.[0].outputs.out') +echo "Got top Julia packages: $TOP_N_FILE" + +TESTER_PROGRAM=$(nix build --impure --expr 'with import ../../../../. {}; haskellPackages.callPackage ./julia-top-n {}' --no-link --json | jq -r '.[0].outputs.out')/bin/julia-top-n-exe +echo "Built tester program: $TESTER_PROGRAM" + +"$TESTER_PROGRAM" --tui -c "$TOP_N_FILE" $* diff --git a/pkgs/development/julia-modules/tests/top-julia-packages.nix b/pkgs/development/julia-modules/tests/top-julia-packages.nix new file mode 100644 index 0000000000000..ca93f42875b33 --- /dev/null +++ b/pkgs/development/julia-modules/tests/top-julia-packages.nix @@ -0,0 +1,28 @@ +with import ../../../../. {}; + +let + package-requests = stdenv.mkDerivation { + name = "julia-package-requests.csv"; + + __impure = true; + + buildInputs = [cacert gzip wget]; + + buildCommand = '' + wget https://julialang-logs.s3.amazonaws.com/public_outputs/current/package_requests.csv.gz + gunzip package_requests.csv.gz + ls -lh + cp package_requests.csv $out + ''; + }; + + registry = callPackage ../registry.nix {}; + +in + +runCommand "top-julia-packages.yaml" { + __impure = true; + nativeBuildInputs = [(python3.withPackages (ps: with ps; [pyyaml toml]))]; +} '' + python ${./process_top_n.py} ${package-requests} ${registry} > $out +'' diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 23cf8571daa6e..20278435cedfa 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.52.1"; + version = "1.52.2"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-zb1EQPbQh5Km51ISRMFzhuIL1TfTdRFwmfyPto/pF0E="; + hash = "sha256-pkOs6qBTyqwNjv+aAV9jbkvRuwnP4nhk40fbZ0YOe5E="; }; patches = [ diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 3eb9fad6336fc..99a3351d56eef 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.41.0"; + version = "0.45.0"; src = fetchurl { - url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-rCodDYKOpgB4fOoefuUNIfDTvZFSzs5hh7ivyQBiKqA="; + url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-PBRUvBWG0Xd29ix1BdQ6BtOr0uLjVkLMpHf6IvJ9mC8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ gettext gnutls nettle libxcrypt ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' - export MACOSX_DEPLOYMENT_TARGET=10.13 # for futimens() + preBuild = lib.optionalString (stdenv.isDarwin) '' + export MACOSX_DEPLOYMENT_TARGET=11.0 ''; enableParallelBuilding = true; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 3fe89f891f8cb..498f26a7caf09 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { src = ./osinfo-db-data-dir.patch; osinfo_db_data_dir = "${osinfo-db}/share"; }) + + # Fix build with libxml 2.12 + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/-/commit/5bbdd06503456784c5ffa22409e8bab50470d673.patch"; + hash = "sha256-KqgHXI+lD5VYp2wtA58Drp15TgNK1O3xCaYBy4/B9wc="; + }) ]; mesonFlags = [ diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix index 049cfcb04d5a9..66a3bf5128f5d 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - pname = "fastnlo_toolkit"; + pname = "fastnlo-toolkit"; version = "2.5.0-2826"; src = fetchurl { diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix index 8f2adb85424b2..19fb83ca78bee 100644 --- a/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-ME0x+1VyfuhJCldwJfjQCtfe9XQk1ptmhv4ghOyNuGA="; + hash = "sha256-wXIbU9/xUyECluL6k1oKS3NBpoC/qjQdW9e485qmlgo="; }; patches = [ diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index bfd23747db0a2..8ad3bb9c356c8 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -36,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch"; hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U="; }) + + # Fix gcc-13 build: + # https://github.com/valhalla/valhalla/pull/4154 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/valhalla/valhalla/commit/ed93f30272377cc6803533a1bb94fe81d14af81c.patch"; + hash = "sha256-w4pnOqk/Jj3unVuesE64QSecrUIVSqwK69t9xNVc4GA="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 92b662ac4484f..2cf0cc3ef8df9 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool +{ stdenv, fetchurl, fetchpatch, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool , openssl, nss, lib, runCommandCC, writeText }: lib.fix (self: @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { patches = [ ./lt_dladdsearchdir.patch + + # Fix build with libxml2 2.12 + (fetchpatch { + url = "https://github.com/lsh123/xmlsec/commit/ffb327376f5bb69e8dfe7f805529e45a40118c2b.patch"; + hash = "sha256-o8CLemOiGIHJsYfVQtNzJNVyk03fdmCbvgA8c3OYxo4="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index d0a4f3b984385..3eb4ff8b2927a 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.3"; + version = "1.7.4"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sz5d5tV6OP8TJMq73gYwCas+jizGzGEnywmOddgpSJQ="; + hash = "sha256-+2tmLclBZrY9SDCKvQ4QNbI4665BtsrEI1sBSY3GVGM="; }; sourceRoot = "${src.name}/core"; diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 736e4497e037e..6dc4c6155adfe 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -13,18 +13,19 @@ , pyyaml , typing-extensions , hypothesis +, dbt-postgres }: buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nl+V8Rtc5FWHIPUkcQmcaex6zwIdzdmEaim59pG497I="; + hash = "sha256-Q3aKUyXB+HzPCpwbJ66zDv92n04Gb0w7ivWfga3UX3s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 5a0127a748bab..f57dc25640e08 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -10,7 +10,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.18.11"; + version = "0.18.12"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -19,8 +19,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "deschler"; repo = "django-modeltranslation"; - rev = "v${version}"; - hash = "sha256-WEtTy449z7Fo9+UmiM+QAuUJ5eQ1RFe1HrIqFrY3L9k="; + rev = "refs/tags/v${version}"; + hash = "sha256-6rAAu3Fd4D93rX8kvkcqhykzBu/lDByQ6zpjWq7J8mg="; }; # Remove all references to pytest-cov diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index 47d58964f4751..6436fc478addd 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, mac_alias +, mac-alias , pytestCheckHook , pythonOlder , setuptools @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - mac_alias + mac-alias ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index b43d51afaa4e8..6b606297813d9 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , python -, pythonImportsCheckHook , makeWrapper }: @@ -19,7 +18,7 @@ buildPythonPackage rec { sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n"; }; - nativeBuildInputs = [ makeWrapper pythonImportsCheckHook ]; + nativeBuildInputs = [ makeWrapper ]; pythonImportsCheck = [ "hjson" ]; diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac-alias/default.nix index 159dfa1d89ad5..159dfa1d89ad5 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac-alias/default.nix diff --git a/pkgs/development/python-modules/mir_eval/default.nix b/pkgs/development/python-modules/mir-eval/default.nix index eaf4a9e4f5353..b06ce59603620 100644 --- a/pkgs/development/python-modules/mir_eval/default.nix +++ b/pkgs/development/python-modules/mir-eval/default.nix @@ -9,12 +9,13 @@ }: buildPythonPackage rec { - pname = "mir_eval"; + pname = "mir-eval"; version = "0.7"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "mir_eval"; + inherit version; hash = "sha256-4f66pXZsZadUXCoXCyQUkPR6mJhzcLHgZ0JCTF3r5l4="; }; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix index 5ecedd0d4c5c9..5525c62b4e161 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py-scrypt/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "scrypt"; + pname = "py-scrypt"; version = "0.8.20"; src = fetchPypi { - inherit pname version; + pname = "scrypt"; + inherit version; hash = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; }; diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index 0b3218e190a44..3aa0d42e2d508 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyrate-limiter"; - version = "3.1.0"; + version = "2.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; - rev = "refs/tags/v${version}"; - hash = "sha256-WL+nNk68NaK36Lwalj23ugiSuB5acSLumLJGQaXE06A="; + rev = "v${version}"; + hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix new file mode 100644 index 0000000000000..17b0aeed0baec --- /dev/null +++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, snakemake-interface-executor-plugins +, snakemake-interface-common +}: + +buildPythonPackage rec { + pname = "snakemake-executor-plugin-cluster-generic"; + version = "1.0.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-1W/8jf+R1798cu3sWI0LTSyVawtmFfwlAqRHwfmIAzU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + snakemake-interface-executor-plugins + snakemake-interface-common + ]; + + pythonImportsCheck = [ "snakemake_executor_plugin_cluster_generic" ]; + + meta = with lib; { + description = "Generic cluster executor for Snakemake"; + homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic/tags"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix new file mode 100644 index 0000000000000..d8a326112c33d --- /dev/null +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, argparse-dataclass +, ConfigArgParse +}: + +buildPythonPackage rec { + pname = "snakemake-interface-common"; + version = "1.15.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Rf2eMkRvkTCR2swB53ekjv8U8DzTPgjhIkBVrn6gTTI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + argparse-dataclass + ConfigArgParse + ]; + + pythonImportsCheck = [ "snakemake_interface_common" ]; + + meta = with lib; { + description = "Common functions and classes for Snakemake and its plugins"; + homepage = "https://github.com/snakemake/snakemake-interface-common"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix new file mode 100644 index 0000000000000..358fdd6141637 --- /dev/null +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, argparse-dataclass +, throttler +, snakemake-interface-common +}: + +buildPythonPackage rec { + pname = "snakemake-interface-executor-plugins"; + version = "8.1.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-QBLdqhR6WrO/zT0Ux5xcUtr5HbrDy91qiWuSjAA5c3E="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + argparse-dataclass + throttler + snakemake-interface-common + ]; + + pythonImportsCheck = [ "snakemake_interface_executor_plugins" ]; + + meta = with lib; { + description = "This package provides a stable interface for interactions between Snakemake and its executor plugins"; + homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix new file mode 100644 index 0000000000000..3d37ec8471ec5 --- /dev/null +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, reretry +, snakemake-interface-common +, throttler +, wrapt +, snakemake +}: + +buildPythonPackage rec { + pname = "snakemake-interface-storage-plugins"; + version = "3.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-MinqSMpBlp3pCgQxorkMdrJuO0GExJsO02kg2/mGsFw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + reretry + snakemake-interface-common + throttler + wrapt + ]; + + pythonImportsCheck = [ "snakemake_interface_storage_plugins" ]; + + meta = with lib; { + description = "This package provides a stable interface for interactions between Snakemake and its storage plugins"; + homepage = "https://github.com/snakemake/snakemake-interface-storage-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv-ipc/default.nix index faf5b5d7d9922..e6e1db135a05c 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv-ipc/default.nix @@ -4,12 +4,13 @@ }: buildPythonPackage rec { - pname = "sysv_ipc"; + pname = "sysv-ipc"; version = "1.1.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "sysv_ipc"; + inherit version; sha256 = "0f063cbd36ec232032e425769ebc871f195a7d183b9af32f9901589ea7129ac3"; }; diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix deleted file mode 100644 index 28b2e5a9f93cf..0000000000000 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy27 -}: - -buildPythonPackage rec { - pname = "thumbor-pexif"; - version = "0.14.1"; - disabled = ! isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "96dcc03ea6066d9546baf54f6841f4048b0b24a291eed65d098b3348c8872d99"; - }; - - meta = with lib; { - description = "Module to parse and edit the EXIF data tags in a JPEG image"; - homepage = "http://www.benno.id.au/code/pexif/"; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index d8a851cb59134..a6918b0476e4d 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.12.1"; + version = "0.16.0"; format = "other"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = pname; rev = version; - sha256 = "sha256-kGCpccWIhaeWrzLlrDI7Vzd0KuAIKxvLrDuSqWtpSLU="; + sha256 = "sha256-Ha94Ca5a7EUBYuSJvMrLc5895Q2/01/tbKpwlHLmTDc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix index 3b4a6406f7032..0cbe573872825 100644 --- a/pkgs/development/tools/haskell/mueval/default.nix +++ b/pkgs/development/tools/haskell/mueval/default.nix @@ -21,11 +21,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin makeWrapper $mueval/bin/mueval $out/bin/mueval \ - --prefix PATH ":" "$out/bin" - - makeWrapper $mueval/bin/mueval-core $out/bin/mueval \ --set "NIX_GHC_LIBDIR" "${libDir}" - ''; passthru = { inherit defaultPkgs; }; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index bc181390664e0..d007756cacf06 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.16.3"; + version = "0.16.7"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 685bb4d1ff687..11d5f4238f9b4 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-AxTTTX4rp881dJuNGIF9s09e5yLohTEeM0LHnsQ+/eQ=" -, "x86_64-darwin": "sha256-DKZUB84PbueRfwVAUH9z8N4JxNlK+db+fVH4jPIbDtc=" -, "aarch64-linux": "sha256-q62a5Ggw0Rikhzn0MY24sSurEPW1/nNehfqVzwBAq/k=" -, "aarch64-darwin": "sha256-9961CGekF8N0bVgtNQIxOoWKB2HgUJ3kBek1rSBHJNk=" +, "x86_64-linux": "sha256-wN+NoIDl8B/ANxES2XVkQBpTK3zUL+Xh+4BxKlcSkr0=" +, "x86_64-darwin": "sha256-ZkIGzcQd+MMJjiHPubLnHcc3H7Qpahs5LyJ+ytrYgfo=" +, "aarch64-linux": "sha256-P/AMelaej8D3BlUQBjOxCn8DADkVsU7lBY5dLJ0Wz6I=" +, "aarch64-darwin": "sha256-jQkLwY6Sq9cN/ujz4wlzjTBjaIYzZKMh/J/5CMWuRf8=" } diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix index 17430a3e02626..ca0af78076f50 100644 --- a/pkgs/development/tools/kubedock/default.nix +++ b/pkgs/development/tools/kubedock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-UCoQm/lg8QRwsK2riJyHmCLg+Ash8Pg+6Va1RVemdt0="; + hash = "sha256-/uC/blvR6+F5Uyj1Fc5I5eSKucc0w76U0cwWKULfdyU="; }; - vendorHash = "sha256-mkzj+8c1MJgPHohSjSj7OW+xoYvI9Qoj3cXJ1iRDeWc="; + vendorHash = "sha256-rkn6JzPB1UNpaCon6LyYNUAsV88t3xbppDrtBwjBEHk="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 2cda52135e977..92db12ce89acf 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.2.2"; + version = "4.2.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-3YKKFWJvTwe/g/+9yAYHTU6chE48zdXpKXDpwLlM7eU="; + sha256 = "sha256-+03wjNxIZr8vhvK3zfvFBwXC5WmEs5A6mydGXsmGuCI="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index cbbb026b8336e..a2ceef50eb6f8 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, haskellPackages, haskell, removeReferencesTo }: +{ stdenv, lib, haskellPackages, haskell, removeReferencesTo, installShellFiles }: let # Since pandoc 3.0 the pandoc binary resides in the pandoc-cli package. @@ -17,7 +17,10 @@ in configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + buildTools = (drv.buildTools or []) ++ [ + removeReferencesTo + installShellFiles + ]; # Normally, the static linked executable shouldn't refer to any library or the compiler. # This is not always the case when the dependency has Paths_* module generated by Cabal, @@ -34,11 +37,13 @@ in -t ${haskellPackages.warp} \ $out/bin/pandoc remove-references-to \ - -t ${haskellPackages.pandoc_3_1_9} \ + -t ${haskellPackages.pandoc_3_1_11} \ $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc + '' + '' + installManPage man/* ''; }) static).overrideAttrs (drv: { # These libraries are still referenced, because they generate @@ -48,5 +53,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_9 ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_11 ]; }) diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index 69fcacb4bc15c..e4121a02f5808 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.37.1"; + version = "0.47.4"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; - rev = "6aa30515838cc0adf7c76a9461f52bdc713f2e9f"; - sha256 = "sha256-oKGA5FZpT3E5G7oREGAojdu4Xn8JPd7IYwfueK9QA34="; + rev = "v${version}"; + hash = "sha256-OfAkqShUAC84buWhQffvIF5i6maPSWKa9nr5hhUwV6Y="; }; - vendorHash = "sha256-iLQwx3B5n21ZXefWiGBBL9roa9LIFByzB8KXLywhvKs="; + vendorHash = "sha256-62SxRvoN4ejmAczs823jftXUmeI4ozfb6plHYT1JwZ0="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 1721e45a1ed05..aadecc823bbe3 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.4.1"; + version = "8.5.1"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-7nln9kuEVt8/NQ3BDdezSNfTyYo6qL2P2m5ZhQ7dAI8="; + hash = "sha256-MzwifQsOSJt9wq8bhVAY6HqXP4Zs4+a2GcG79PdAiMY="; }; - cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM="; + cargoHash = "sha256-wyyIZ7i1icvD53hnUM4H/kvxj6K/pVzAAvKKp5LzwTE="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; diff --git a/pkgs/development/tools/templ/default.nix b/pkgs/development/tools/templ/default.nix index cd30c9a45c3f8..76a006654fb25 100644 --- a/pkgs/development/tools/templ/default.nix +++ b/pkgs/development/tools/templ/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "templ"; - version = "0.2.501"; + version = "0.2.513"; subPackages = [ "cmd/templ" ]; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "a-h"; repo = "templ"; rev = "refs/tags/v${version}"; - hash = "sha256-MkSGQZo2Zv6aCVANh2ETXoCXETkp+xk8jWAW4Wj+y2s="; + hash = "sha256-LWvwtAX1KBK33FIyY6alkG0RBXL6Ce4fR0cklQfwaRk="; }; vendorHash = "sha256-buJArvaaKGRg3yS7BdcVY0ydyi4zah57ABeo+CHkZQU="; diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index 5e6fa7ad9d187..7216db3ee4f5e 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.1.3"; + version = "5.2"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-hwjz9nzhasDIeFlmPIwBNhJjrNfZ8ksttx5A7WSomBQ="; + hash = "sha256-1E3tAt4zOyaof2iBT3S9DfNIgpJj9U0rwGIZpM7cTbA="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index cf54b048f5914..460ebb8a3af0d 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -287,6 +287,38 @@ let plugins = { }; meta = common_meta // { description = "iscan GT-X750 for " + passthru.hw; }; }; + gt1500 = stdenv.mkDerivation rec { + name = "iscan-gt-1500-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8="; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin" + ''; + hw = "GT-1500"; + }; + meta = common_meta // { description = "iscan GT-1500 for " + passthru.hw; }; + }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; # for the version, look for the driver of XP-750 in the search page diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ab5b7c04e9f60..526533e442225 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.6.9"; #zen + version = "6.6.10"; #zen suffix = "zen1"; #zen - sha256 = "09vrkwyx4ri6ba48jfv8j4ssj0h0w2wgzqwwb8ribif1rkb59mw0"; #zen + sha256 = "1hhy5jp1s65vpvrw9xylx3xl7mmagzmm5r9bq81hvvr7bhf754ny"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.6.9"; #lqx + version = "6.6.10"; #lqx suffix = "lqx1"; #lqx - sha256 = "1ivf4iwxjp28xmfk8y3wxs64jqrjzgn6xwxkpad3mxc9n18yl8hz"; #lqx + sha256 = "1rfia3cbs81gjvr8r1w4kgi3ghr3plqyzaiglifbdr1zkxjias44"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 321d15ce6c5d0..34c798ca3355a 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -11,14 +11,13 @@ , stdenv , swig , systemd -, fetchpatch # ImportError: cannot import name 'mlog' from 'mesonbuild' , withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform }: stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.6"; + version = "1.7.1"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; @@ -26,27 +25,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "linux-nvme"; repo = "libnvme"; rev = "v${finalAttrs.version}"; - hash = "sha256-7bvjsmt16/6RycSDKIECtJ4ES7NTaspU6IMpUw0sViA="; + hash = "sha256-hCR/K8bPXj8HthayrnwwGfI+wxpUwcWkcx3S/8h+3m8="; }; - patches = [ - # included in next release - (fetchpatch { - url = "https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1.patch"; - hash = "sha256-IUjPUBmGQC4oAKFFlBrjonqD2YdyNPC9siK4t/t2slE="; - }) - # included in next release - (fetchpatch { - url = "https://github.com/linux-nvme/libnvme/commit/a2b8e52e46cfd888ac5a48d8ce632bd70a5caa93.patch"; - hash = "sha256-AVSWraFriErfz7dA2CjU8+ehJtAmuLxBZyBALygmrf0="; - }) - # included in next release - (fetchpatch { - url = "https://github.com/linux-nvme/libnvme/commit/68c6ffb11d40a427fc1fd70ac2ac97fd01952913.patch"; - hash = "sha256-dvc1sjgCFU31/LornvJ/aRVYtPOsewkas0jS+/AwFuU="; - }) - ]; - postPatch = '' patchShebangs scripts ''; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index e0d0372fd6ff2..d10900d3958aa 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-MFyBkwTNOBQdHWj7In1OquRIAsjsd4/DHYfUyFA9YDQ="; + hash = "sha256-qijzXucNE+M8fOEtNaoQYX41HeJOMtg/cJFCUJyS6Ew="; }; mesonFlags = [ @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { libnvme json_c zlib - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [ - libhugetlbfs ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 5b627ea9033b1..bd322bfa100e9 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -1,18 +1,17 @@ { lib, stdenv, fetchFromGitHub }: ## Usage -# In NixOS, simply add this package to services.udev.packages: -# services.udev.packages = [ pkgs.qmk-udev-rules ]; +# In NixOS, set hardware.keyboard.qmk.enable = true; stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.22.3"; + version = "0.23.3"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - hash = "sha256-HLQxmBlzTdsOAMqfc4taoMM+V2G5novMsbc1drZlNGg="; + hash = "sha256-dFc6S9x7sBYZAQn0coZJpmGz66Fx0l4rrexjyB4k0zA="; }; dontBuild = true; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 6f3d8c5ffd897..ae0db59d0b32f 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, writeShellScript +, fetchpatch , autoreconfHook , pkg-config , runCommand @@ -40,25 +40,33 @@ let mkdir -p $out/bin ln -s /run/wrappers/bin/sendmail $out/bin/mailq ''; - - # For unknown reasons the installer tries executing $out/share and fails so - # we create it and remove it again later. - share = writeShellScript "share" '' - exit 0 - ''; - in stdenv.mkDerivation rec { pname = "monitoring-plugins"; - version = "2.3.0"; + version = "2.3.5"; src = fetchFromGitHub { owner = "monitoring-plugins"; repo = "monitoring-plugins"; - rev = "v" + lib.versions.majorMinor version; - sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg="; + rev = "v${version}"; + sha256 = "sha256-J9fzlxIpujoG7diSRscFhmEV9HpBOxFTJSmGGFjAzcM="; }; + patches = [ + # fix build (makefile cannot produce -lcrypto) + # remove on next release + (fetchpatch { + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/bad156676894a2755c8b76519a11cdd2037e5cd6.patch"; + hash = "sha256-aI/sX04KXe968SwdS8ZamNtgdNbHtho5cDsDaA+cjZY="; + }) + # fix check_smtp with --starttls https://github.com/monitoring-plugins/monitoring-plugins/pull/1952 + # remove on next release + (fetchpatch { + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/2eea6bb2a04bbfb169bac5f0f7c319f998e8ab87.patch"; + hash = "sha256-CyVD340+zOxuxRRPmtowD3DFFRB1Q7+AANzul9HqwBI="; + }) + ]; + # TODO: Awful hack. Grrr... # Anyway the check that configure performs to figure out the ping # syntax is totally impure, because it runs an actual ping to @@ -78,8 +86,6 @@ stdenv.mkDerivation rec { --with-ping-command='${lib.getBin unixtools.ping}/bin/ping -4 -n -U -w %d -c %d %s' --with-ping6-command='${lib.getBin unixtools.ping}/bin/ping -6 -n -U -w %d -c %d %s' ) - - install -Dm555 ${share} $out/share ''; configureFlags = [ @@ -107,10 +113,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - rm $out/share - ''; - meta = with lib; { description = "Official monitoring plugins for Nagios/Icinga/Sensu and others"; homepage = "https://www.monitoring-plugins.org"; diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index abcba7dfb0b22..23db7d8e6f3f3 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-QII93sd/Lh+m6S5HtDsOt2BUnqg+X8I24KoU+MAWWQU="; + hash = "sha256-cWXfMi48aF06Prua3n4geG2yP1JzLlHq/xh1HmiJkT4="; }; - vendorHash = "sha256-khNkh2LufCE3KdPYRCALz66X+Q1U+sTIILh4uDzhKiI="; + vendorHash = "sha256-69YBrDAEruWXaAqLfRVtqmZ0pop3r5cusePSV2Q1MXw="; ldflags = [ "-s" diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 2d12b78ebfe97..285f2b83578c5 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -148,15 +148,6 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - # FIXME: see if it's still necessary and remove on next release - patches = [ - (fetchpatch { - url = "https://github.com/MusicPlayerDaemon/MPD/commit/50c1e3738a672f933560247b5527d365d17b1c02.patch"; - hash = "sha256-99XL3Yb1f9yrD0p+Ssn1HfAHrVoO/ky6bp3e1n1+yvg="; - excludes = [ "NEWS" ]; - }) - ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index fc5d0b4ce7c28..485c27e12da88 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-VFyFQ3c4EEbQAj3bUgjWbmpCyugcpfz0phgBz0ZUB/Q="; + sha256 = "sha256-VIGlJ5+99l+VSUl7c9jiQf94X/JV0+HFgI8xQ4ZLQ9s="; }; patches = [ diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 802c7a46215be..438a09567f5da 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.99.0"; + version = "0.100.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-1Fw/1OVSKW+sIfVD4rodtTwu7JUhIsLEvIpYP49SqKQ="; + hash = "sha256-NF+Cjf3EZ9nNi10ckEuL6CnUJZssSuv3cq95QIoj+e8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-y6tw/umiEgwdoafa/CTg78naMWvr+DBOtXT/rMs1agQ="; + vendorHash = "sha256-C6I9NGIt++FesC86NgZc2jrPHQvS5Xmgdc/tlvPJzMo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index 43d3400ccf55d..c3b086806ca10 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "0.14.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ULttOJcP3LHQAlyJKGEKT3B3PqYOP5+IxDej673020M="; + sha256 = "sha256-zz9DqRrylCbUCSBl4wspb8BYfmCyQhMmmYwdsbTExbo="; }; vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY="; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index fa9635f0cb8aa..64e00642889c1 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.10"; + version = "6.0.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-l12MHMLEHHztxOMjr/A12Xf+ual/ApbdKopm0Zelsnw="; + sha256 = "sha256-Y1oo8Jk/arDRF54HKtObgTnQf1Ejf4Qdk8bC/0sXWOw="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix index ca4381e78a036..77a4d9e268bbe 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2023-12-07"; + version = "2024-01-1"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-2bwgvdXPbSiG2BE2vkT2ThjdkrWgt3v8U729sBMuymg="; + hash = "sha256-iKzq0hH45uHtWr2QZsVSPUZjmU6rXUGqVQ8SlIhOuJ0="; }; buildInputs = [ diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix index fa906506fff1e..d043385f2069e 100644 --- a/pkgs/tools/misc/killport/default.nix +++ b/pkgs/tools/misc/killport/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "killport"; - version = "0.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - hash = "sha256-aaKvrWJGZ26wyqoblAcUkGUPkbt8XNx9Z4xT+qI2B3o="; + hash = "sha256-eyRI4ZVp9HPMvpzyV9sQdh2r966pCdyUPnEhxGkzH3Q="; }; - cargoHash = "sha256-4CUMt5aDHq943uU5PAY1TJtmCqlBvgOruGQ69OG5fB4="; + cargoHash = "sha256-QQ43dT9BTu7qCzpnTGKzlVL6jKDXofXStYWYNLHSuVs="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index be78d6c026004..774ccd946aa72 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -26,6 +27,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0="; }; + patches = [ + # Fix build with libxml 2.12 + (fetchpatch { + url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/019487cbc79925e49988789bf533c78dab7e1842.patch"; + hash = "sha256-skuspjHDRilwym+hFInrSvIZ+rrzBOoI7WeFj2SrGkc="; + }) + (fetchpatch { + url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f.patch"; + hash = "sha256-I9vRRbnotqRi8+7q1eZLJwQLaT9J4G3h+3rKxlaCME4="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 56b8bf7760b24..ad6652a67081e 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "godns"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-1eJAGBKyTXcFFB7HKkljYQkkidQ3VicHy5MMwHY6iHU="; + hash = "sha256-pp4dWc9jqBOsriCL0giBJ9S8a6hXRXfLXMBZMX0hCo4="; }; - vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE="; + vendorHash = "sha256-PVp09gWk35T0gQoYOPzaVFtrqua0a8cNjPOgfYyu7zg="; # Some tests require internet access, broken in sandbox doCheck = false; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index b20165a078616..5638676838f76 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -77,7 +77,11 @@ in export QTCOMPOSE=${xorg.libX11}/share/X11/locale export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so # Allows `conda activate` to work properly - source ${installationPath}/etc/profile.d/conda.sh + condaSh=${installationPath}/etc/profile.d/conda.sh + if [ ! -f $condaSh ]; then + conda-install + fi + source $condaSh ''; runScript = "bash -l"; diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 41e7fe04480e6..31a19b542e70a 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.9"; + version = "5.1.10"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-H8zbxNsGkuKIDPwGWfKJEy5gTo2Mm13VKwce+h9NEro="; + hash = "sha256-u+UiiCl67VtIedW4kn3fycafkgBVsFFkWQcN3NXQKl4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index fb196eefb2569..9a1b3ec59bed9 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2023-12-31"; + version = "unstable-2024-01-05"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "2e8634c252890cb38c60ab996af04926537cbc27"; - hash = "sha256-oYMwbObpWheGeeNWY1LjO/+omrbAWDNdyzNDxTr2jo8="; + rev = "51e44a13acea71b36245e8bd8c7db53e0a3e61ee"; + hash = "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 280c4faf35020..d4d0c91f87705 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.12.3"; + version = "9.13.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-wPbUqen1y/+zlv+4giY/0ZVZEfSUYhvJBO1yl3NZMtw="; + hash = "sha256-hGiMdL+SXJ5psrmfM5pvKD01yaD1q3tOOhfGzbcjvuE="; }; proxyVendor = true; - vendorHash = "sha256-VL7AD3W6gieKhcglsON1pi4vbe+tbw/P22RU5Zfq/2U="; + vendorHash = "sha256-pRFRPUL/Ck4m7JH5ykei3PSXbCFKRii8YyjBLQ5kb9M="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index 25a1d869dd349..8851065284839 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.5.3"; + version = "8.5.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-dDB1afMtuK4SySa5HX6LhOnPUXlKSzpJDJ+/1SCcB/0="; + sha256 = "sha256-Ip8SJi77QjNF2ez2NU48NKi+suOhViecuQyXSY6hLkI="; }; vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e40ba0c78328b..ccbeaced8a6af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -264,7 +264,8 @@ mapAliases ({ ### F ### faustStk = faustPhysicalModeling; # Added 2023-05-16 - fastnlo = fastnlo_toolkit; # Added 2021-04-24 + fastnlo = fastnlo-toolkit; # Added 2021-04-24 + fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21ff69071b479..24eca47e02c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31875,7 +31875,9 @@ with pkgs; feishu = callPackage ../applications/networking/instant-messengers/feishu { }; - filezilla = callPackage ../applications/networking/ftp/filezilla { }; + filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security; + }; fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire { inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit; @@ -40015,7 +40017,7 @@ with pkgs; fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; - fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { }; + fastnlo-toolkit = callPackage ../development/libraries/physics/fastnlo-toolkit { }; geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index da8ea5e389b78..5a6be8b4b8f94 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -145,6 +145,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 factory_boy = factory-boy; # added 2023-10-08 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 + fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 inherit (super.pkgs) fetchPypi; # added 2023-05-25 filebrowser_safe = filebrowser-safe; # added 2024-01-03 @@ -255,6 +256,7 @@ mapAliases ({ Markups = markups; # added 2022-02-14 markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10 mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10 + mac_alias = mac-alias; # added 2024-01-07 MDP = mdp; # added 2023-02-19 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 @@ -264,6 +266,7 @@ mapAliases ({ manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 memory_profiler = memory-profiler; # added 2023-10-09 + mir_eval = mir-eval; # added 2024-01-07 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28 @@ -357,6 +360,7 @@ mapAliases ({ Pyro5 = pyro5; # added 2023-02-19 PyRSS2Gen = pyrss2gen; # added 2023-02-19 pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 + py_scrypt = py-scrypt; # added 2024-01-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysmart-smartx = pysmart; # added 2021-10-22 pySmartDL = pysmartdl; # added 2023-10-11 @@ -455,6 +459,7 @@ mapAliases ({ suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27 supervise_api = supervise-api; # added 2023-10-11 suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27 + sysv_ipc = sysv-ipc; # added 2024-01-07 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 @@ -464,6 +469,7 @@ mapAliases ({ Theano = theano; # added 2023-02-19 TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 + thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07 torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3474f3b6c829e..4152cc2645aba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3928,7 +3928,7 @@ self: super: with self; { fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; - fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { + fastnlo-toolkit = toPythonModule (pkgs.fastnlo-toolkit.override { withPython = true; inherit (self) python; }); @@ -6679,7 +6679,7 @@ self: super: with self; { m3u8 = callPackage ../development/python-modules/m3u8 { }; - mac_alias = callPackage ../development/python-modules/mac_alias { }; + mac-alias = callPackage ../development/python-modules/mac-alias { }; mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; @@ -7047,7 +7047,7 @@ self: super: with self; { mip = callPackage ../development/python-modules/mip { }; - mir_eval = callPackage ../development/python-modules/mir_eval { }; + mir-eval = callPackage ../development/python-modules/mir-eval { }; mirakuru = callPackage ../development/python-modules/mirakuru { }; @@ -11155,7 +11155,7 @@ self: super: with self; { pyscreeze = callPackage ../development/python-modules/pyscreeze { }; - py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + py-scrypt = callPackage ../development/python-modules/py-scrypt { }; pyscrypt = callPackage ../development/python-modules/pyscrypt { }; @@ -13328,6 +13328,14 @@ self: super: with self; { inherit (self) python; }); + snakemake-executor-plugin-cluster-generic = callPackage ../development/python-modules/snakemake-executor-plugin-cluster-generic { }; + + snakemake-interface-common = callPackage ../development/python-modules/snakemake-interface-common { }; + + snakemake-interface-executor-plugins = callPackage ../development/python-modules/snakemake-interface-executor-plugins { }; + + snakemake-interface-storage-plugins = callPackage ../development/python-modules/snakemake-interface-storage-plugins { }; + snakebite = callPackage ../development/python-modules/snakebite { }; snakeviz = callPackage ../development/python-modules/snakeviz { }; @@ -13940,7 +13948,7 @@ self: super: with self; { inherit (pkgs) systemd; }; - sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; + sysv-ipc = callPackage ../development/python-modules/sysv-ipc { }; syrupy = callPackage ../development/python-modules/syrupy { }; @@ -14278,8 +14286,6 @@ self: super: with self; { throttler = callPackage ../development/python-modules/throttler { }; - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - tkinter = callPackage ../development/python-modules/tkinter { py = python.override { x11Support=true; }; }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 376aa60cd14c3..6a60de224ade4 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -506,6 +506,8 @@ let haskell-language-server = lib.subtractLists [ # Support ceased as of 2.3.0.0 compilerNames.ghc8107 + # Support ceased as of 2.5.0.0 + compilerNames.ghc902 ] released; hoogle = lib.subtractLists [ compilerNames.ghc963 diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 7d4d220e23a8b..7fdea87f3d60a 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2520,10 +2520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; + sha256 = "NBOIGE6XXQkebjjOPzsziL+35Kw9eQ79jjkSSEQEC9E="; type = "gem"; }; - version = "1.15.5"; + version = "1.16.0"; }; octokit = { dependencies = ["faraday" "sawyer"]; |