diff options
753 files changed, 8475 insertions, 4772 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 693ea016e0a55..fe28f94c069d3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -288,7 +288,7 @@ self: super: { ps: with ps; [ pyflakes pytest - python-language-server + black ] )) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 81631a4293f67..35616b4d21265 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -513,15 +513,26 @@ github = "alexnortung"; githubId = 1552267; }; + alexshpilkin = { + email = "ashpilkin@gmail.com"; + github = "alexshpilkin"; + githubId = 1010468; + keys = [{ + longkeyid = "rsa4096/0x73E9AA114B3A894B"; + fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; + }]; + matrix = "@alexshpilkin:matrix.org"; + name = "Alexander Shpilkin"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; githubId = 782180; name = "Alex Vorobiev"; }; - alex-eyre = { + alexeyre = { email = "A.Eyre@sms.ed.ac.uk"; - github = "alex-eyre"; + github = "alexeyre"; githubId = 38869148; name = "Alex Eyre"; }; @@ -972,6 +983,12 @@ githubId = 1118815; name = "Vikram Narayanan"; }; + armeenm = { + email = "mahdianarmeen@gmail.com"; + github = "armeenm"; + githubId = 29145250; + name = "Armeen Mahdian"; + }; armijnhemel = { email = "armijn@tjaldur.nl"; github = "armijnhemel"; @@ -5023,6 +5040,12 @@ githubId = 222664; name = "Matthew Leach"; }; + hexchen = { + email = "nix@lilwit.ch"; + github = "hexchen"; + githubId = 41522204; + name = "hexchen"; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; @@ -13976,6 +13999,13 @@ githubId = 6191421; name = "Edward d'Albon"; }; + zebreus = { + matrix = "@lennart:cicen.net"; + email = "lennarteichhorn+nixpkgs@gmail.com"; + github = "Zebreus"; + githubId = 1557253; + name = "Lennart Eichhorn"; + }; zef = { email = "zef@zef.me"; name = "Zef Hemel"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 26f0f1d48d46f..8b21f98409ef1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -445,6 +445,19 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + numtide = { + members = [ + mic92 + flokli + jfroche + tazjin + zimbatm + ]; + enableFeatureFreezePing = true; + scope = "Group registration for Numtide team members who collectively maintain packages."; + shortName = "Numtide team"; + }; + openstack = { members = [ emilytrau diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index 525531a478135..024a24379dd6d 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -248,7 +248,7 @@ $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-co (since your Nix install was probably single user): </para> <programlisting> -$ sudo chown -R 0.0 /nix +$ sudo chown -R 0:0 /nix </programlisting> </listitem> <listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 6da24e3a8a81a..ab0edcebc679a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -455,6 +455,12 @@ <link xlink:href="options.html#opt-services.nifi.enable">services.nifi</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://kanidm.github.io/kanidm/stable/">kanidm</link>, + an identity management server written in Rust. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> @@ -2465,6 +2471,21 @@ hosts. </para> </listitem> + <listitem> + <para> + The option + <link xlink:href="options.html#opt-networking.useDHCP">networking.useDHCP</link> + isn’t deprecated anymore. When using + <link xlink:href="options.html#opt-networking.useNetworkd"><literal>systemd-networkd</literal></link>, + a generic <literal>.network</literal>-unit is added which + enables DHCP for each interface matching + <literal>en*</literal>, <literal>eth*</literal> or + <literal>wl*</literal> with priority 99 (which means that it + doesn’t have any effect if such an interface is matched by a + <literal>.network-</literal>unit with a lower priority). In + case of scripted networking, no behavior was changed. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index d9060eb89c372..fa8806f791d52 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -177,7 +177,7 @@ The first steps to all these are the same: was probably single user): ```ShellSession - $ sudo chown -R 0.0 /nix + $ sudo chown -R 0:0 /nix ``` 1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 90d226437012b..af65ae4613125 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -135,6 +135,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [nifi](https://nifi.apache.org), an easy to use, powerful, and reliable system to process and distribute data. Available as [services.nifi](options.html#opt-services.nifi.enable). +- [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} @@ -875,4 +877,11 @@ In addition to numerous new and upgraded packages, this release has the followin `true` starting with NixOS 22.11. Enable it explicitly if you need to control Snapserver remotely or connect streamig clients from other hosts. +- The option [networking.useDHCP](options.html#opt-networking.useDHCP) isn't deprecated anymore. + When using [`systemd-networkd`](options.html#opt-networking.useNetworkd), a generic + `.network`-unit is added which enables DHCP for each interface matching `en*`, `eth*` + or `wl*` with priority 99 (which means that it doesn't have any effect if such an interface is matched + by a `.network-`unit with a lower priority). In case of scripted networking, no behavior + was changed. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/maintainers/scripts/lxd/lxd-image.nix b/nixos/maintainers/scripts/lxd/lxd-image.nix index c76b9fcc7f779..6aa3f2f558471 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image.nix @@ -27,7 +27,7 @@ with lib; networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - # As this is intended as a stadalone image, undo some of the minimal profile stuff + # As this is intended as a standalone image, undo some of the minimal profile stuff documentation.enable = true; documentation.nixos.enable = true; environment.noXlibs = false; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 618057618d0c3..3f92b779d60a2 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -46,5 +46,5 @@ with lib; done ''; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = lib.mkDefault lib.trivial.release; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index fb5d3ba473255..b74ec838df42f 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -581,17 +581,19 @@ ${\join "", (map { " $_\n" } (uniq @attrs))}} EOF sub generateNetworkingDhcpConfig { + # FIXME disable networking.useDHCP by default when switching to networkd. my $config = <<EOF; - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = lib.mkDefault false; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. + networking.useDHCP = lib.mkDefault true; EOF foreach my $path (glob "/sys/class/net/*") { my $dev = basename($path); if ($dev ne "lo") { - $config .= " networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n"; + $config .= " # networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n"; } } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index bf5ec0f9690b0..8aff02dc11805 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -177,6 +177,10 @@ in # users.users.jane = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # thunderbird + # ]; # }; # List packages installed in system profile. To search, run: @@ -184,7 +188,6 @@ in # environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - # firefox # ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 931201ade2935..010acdb72f678 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -146,6 +146,15 @@ in "/etc/os-release".source = initrdRelease; "/etc/initrd-release".source = initrdRelease; }; + + # We have to use `warnings` because when warning in the default of the option + # the warning would also be shown when building the manual since the manual + # has to evaluate the default. + # + # TODO Remove this and drop the default of the option so people are forced to set it. + # Doing this also means fixing the comment in nixos/modules/testing/test-instrumentation.nix + warnings = lib.optional (options.system.stateVersion.highestPrio == (lib.mkOptionDefault { }).priority) + "system.stateVersion is not set, defaulting to ${config.system.stateVersion}. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion."; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9d9f2e9057cc0..dc658db8e2edd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -196,7 +196,6 @@ ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix - ./programs/phosh.nix ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix @@ -975,6 +974,7 @@ ./services/security/hockeypuck.nix ./services/security/hologram-server.nix ./services/security/hologram-agent.nix + ./services/security/kanidm.nix ./services/security/munge.nix ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index e63f19010de8a..169ef7442626e 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -98,7 +98,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" # Set desired capabilities on the file plus cap_setpcap so # the wrapper program can elevate the capabilities set on @@ -126,7 +126,7 @@ let # Prevent races chmod 0000 "$wrapperDir/${program}" - chown ${owner}.${group} "$wrapperDir/${program}" + chown ${owner}:${group} "$wrapperDir/${program}" chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" ''; diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix index 5e5c0bbecccaa..9414d78aa751d 100644 --- a/nixos/modules/services/backup/borgmatic.nix +++ b/nixos/modules/services/backup/borgmatic.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.services.borgmatic; - cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings); + settingsFormat = pkgs.formats.yaml { }; + cfgfile = settingsFormat.generate "config.yaml" cfg.settings; in { options.services.borgmatic = { enable = mkEnableOption "borgmatic"; @@ -14,7 +15,7 @@ in { See https://torsion.org/borgmatic/docs/reference/configuration/ ''; type = types.submodule { - freeformType = with lib.types; attrsOf anything; + freeformType = settingsFormat.type; options.location = { source_directories = mkOption { type = types.listOf types.str; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index cc5de97d6d10d..90adab7fbf2e8 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -300,17 +300,17 @@ in }; preStart = '' mkdir -p ${baseDir} - chown hydra.hydra ${baseDir} + chown hydra:hydra ${baseDir} chmod 0750 ${baseDir} ln -sf ${hydraConf} ${baseDir}/hydra.conf mkdir -m 0700 -p ${baseDir}/www - chown hydra-www.hydra ${baseDir}/www + chown hydra-www:hydra ${baseDir}/www mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0750 -p ${baseDir}/build-logs - chown hydra-queue-runner.hydra ${baseDir}/queue-runner ${baseDir}/build-logs + chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs ${optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then @@ -338,7 +338,7 @@ in rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots fi - chown hydra.hydra ${cfg.gcRootsDir} + chown hydra:hydra ${cfg.gcRootsDir} chmod 2775 ${cfg.gcRootsDir} ''; serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init"; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index ff73d7a46ed39..bb6898a08c52b 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -87,6 +87,18 @@ in a new map with default settings will be generated before starting the service. ''; }; + loadLatestSave = mkOption { + type = types.bool; + default = false; + description = '' + Load the latest savegame on startup. This overrides saveName, in that the latest + save will always be used even if a saved game of the given name exists. It still + controls the 'canonical' name of the savegame. + + Set this to true to have the server automatically reload a recent autosave after + a crash or desync. + ''; + }; # TODO Add more individual settings as nixos-options? # TODO XXX The server tries to copy a newly created config file over the old one # on shutdown, but fails, because it's in the nix store. When is this needed? @@ -250,8 +262,9 @@ in "--config=${cfg.configFile}" "--port=${toString cfg.port}" "--bind=${cfg.bind}" - "--start-server=${mkSavePath cfg.saveName}" + (optionalString (!cfg.loadLatestSave) "--start-server=${mkSavePath cfg.saveName}") "--server-settings=${serverSettingsFile}" + (optionalString cfg.loadLatestSave "--start-server-load-latest") (optionalString (cfg.mods != []) "--mod-directory=${modDir}") (optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") ]; diff --git a/nixos/modules/services/hardware/illum.nix b/nixos/modules/services/hardware/illum.nix index ff73c99a65376..7f7a850002342 100644 --- a/nixos/modules/services/hardware/illum.nix +++ b/nixos/modules/services/hardware/illum.nix @@ -28,6 +28,7 @@ in { description = "Backlight Adjustment Service"; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d"; + serviceConfig.Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 6022227f6ea88..e255e5d22188b 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -360,7 +360,14 @@ in { }; config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + assertions = [ + { + assertion = cfg.openFirewall -> !isNull cfg.config; + message = "openFirewall can only be used with a declarative config"; + } + ]; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ]; systemd.services.home-assistant = { description = "Home Assistant"; diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/matrix-synapse.nix index a498aff7a55bb..87a977f8e1efb 100644 --- a/nixos/modules/services/matrix/matrix-synapse.nix +++ b/nixos/modules/services/matrix/matrix-synapse.nix @@ -296,6 +296,7 @@ in { default = if lib.versionAtLeast config.system.stateVersion "22.05" then "${cfg.dataDir}/media_store" else "${cfg.dataDir}/media"; + defaultText = "${cfg.dataDir}/media_store for when system.stateVersion is at least 22.05, ${cfg.dataDir}/media when lower than 22.05"; description = '' Directory where uploaded images and attachments are stored. ''; diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix index 7ce8a23d9af12..deefb061d8b31 100644 --- a/nixos/modules/services/misc/heisenbridge.nix +++ b/nixos/modules/services/misc/heisenbridge.nix @@ -204,7 +204,7 @@ in NoNewPrivileges = true; LockPersonality = true; RestrictRealtime = true; - SystemCallFilter = ["@system-service" "~@priviledged" "@chown"]; + SystemCallFilter = ["@system-service" "~@privileged" "@chown"]; SystemCallArchitectures = "native"; RestrictAddressFamilies = "AF_INET AF_INET6"; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 52525e8935bae..ceb2db1faefd8 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -3,6 +3,7 @@ with lib; let + json = pkgs.formats.json { }; cfg = config.services.prometheus; workingDir = "/var/lib/" + cfg.stateDir; @@ -34,13 +35,7 @@ let promtool ${what} $out '' else file; - # Pretty-print JSON to a file - writePrettyJSON = name: x: - pkgs.runCommandLocal name { } '' - echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out - ''; - - generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; + generatedPrometheusYml = json.generate "prometheus.yml" promConfig; # This becomes the main config file for Prometheus promConfig = { diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 3e3a3c1aa94d4..e68f8a47d5c0d 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -36,11 +36,11 @@ config = mkIf cfg.enable { preStart = '' if [ ! -d ${cfg.settingsDir} ] ; then mkdir -m 0750 -p ${cfg.settingsDir} - chown -R gateone.gateone ${cfg.settingsDir} + chown -R gateone:gateone ${cfg.settingsDir} fi if [ ! -d ${cfg.pidDir} ] ; then mkdir -m 0750 -p ${cfg.pidDir} - chown -R gateone.gateone ${cfg.pidDir} + chown -R gateone:gateone ${cfg.pidDir} fi ''; #unitConfig.RequiresMountsFor = "${cfg.settingsDir}"; diff --git a/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf index 17ef203840af5..b82094cf5f093 100644 --- a/nixos/modules/services/networking/ircd-hybrid/ircd.conf +++ b/nixos/modules/services/networking/ircd-hybrid/ircd.conf @@ -98,7 +98,7 @@ serverinfo { * * openssl genrsa -out rsa.key 2048 * openssl rsa -in rsa.key -pubout -out rsa.pub - * chown <ircd-user>.<ircd.group> rsa.key rsa.pub + * chown <ircd-user>:<ircd.group> rsa.key rsa.pub * chmod 0600 rsa.key * chmod 0644 rsa.pub */ diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index c6d4c14dcb7e2..9b8382392c0a7 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,7 +1,6 @@ { config, options, lib, pkgs, stdenv, ... }: let cfg = config.services.pleroma; - cookieFile = "/var/lib/pleroma/.cookie"; in { options = { services.pleroma = with lib; { @@ -9,7 +8,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma.override { inherit cookieFile; }; + default = pkgs.pleroma; defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; @@ -101,6 +100,7 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -118,10 +118,10 @@ in { # Better be safe than sorry migration-wise. ExecStartPre = let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ] + if [ ! -f /var/lib/pleroma/.cookie ] then echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}" + dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie fi ${cfg.package}/bin/pleroma_ctl migrate ''; diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 3e7753b9dd352..423e14e998f85 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -108,7 +108,7 @@ with lib; #username pptpd password * EOF - chown root.root "$secrets" + chown root:root "$secrets" chmod 600 "$secrets" ''; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index ae9258b27122f..513509eaca3ab 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -82,7 +82,7 @@ in serviceConfig.Type = "forking"; preStart = '' mkdir -m 0755 -p ${stateDir} - chown ${prayerUser}.${prayerGroup} ${stateDir} + chown ${prayerUser}:${prayerGroup} ${stateDir} ''; script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; }; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1f64113950a79..0133874d0e0d0 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -2,9 +2,13 @@ with lib; -let cfg = config.services.tailscale; +let + cfg = config.services.tailscale; + firewallOn = config.networking.firewall.enable; + rpfMode = config.networking.firewall.checkReversePath; + rpfIsStrict = rpfMode == true || rpfMode == "strict"; in { - meta.maintainers = with maintainers; [ danderson mbaillie ]; + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; options.services.tailscale = { enable = mkEnableOption "Tailscale client daemon"; @@ -36,17 +40,34 @@ in { }; config = mkIf cfg.enable { + warnings = optional (firewallOn && rpfIsStrict) "Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting `networking.firewall.checkReversePath` = 'loose'"; environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openresolv pkgs.procps ]; + path = [ + pkgs.openresolv # for configuring DNS in some configs + pkgs.procps # for collecting running services (opt-in feature) + pkgs.glibc # for `getent` to look up user shells + ]; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' ] ++ (lib.optionals (cfg.permitCertUid != null) [ "TS_PERMIT_CERT_UID=${cfg.permitCertUid}" ]); + # Restart tailscaled with a single `systemctl restart` at the + # end of activation, rather than a `stop` followed by a later + # `start`. Activation over Tailscale can hang for tens of + # seconds in the stop+start setup, if the activation script has + # a significant delay between the stop and start phases + # (e.g. script blocked on another unit with a slow shutdown). + # + # Tailscale is aware of the correctness tradeoff involved, and + # already makes its upstream systemd unit robust against unit + # version mismatches on restart for compatibility with other + # linux distros. + stopIfChanged = false; }; }; } diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 31731b60d484d..9bc019039e0b6 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -383,9 +383,9 @@ in }; preStart = '' mkdir -p /etc/tinc/${network}/hosts - chown tinc.${network} /etc/tinc/${network}/hosts + chown tinc:${network} /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/invitations - chown tinc.${network} /etc/tinc/${network}/invitations + chown tinc:${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 7dbe51422d964..9418488c1e94f 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -116,18 +116,18 @@ with lib; #username xl2tpd password * EOF - chown root.root ppp/chap-secrets + chown root:root ppp/chap-secrets chmod 600 ppp/chap-secrets # The documentation says this file should be present but doesn't explain why and things work even if not there: [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets - chown root.root l2tp-secrets + chown root:root l2tp-secrets chmod 600 l2tp-secrets popd > /dev/null mkdir -p /run/xl2tpd - chown root.root /run/xl2tpd + chown root:root /run/xl2tpd chmod 700 /run/xl2tpd ''; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix new file mode 100644 index 0000000000000..a7c51b9a877f1 --- /dev/null +++ b/nixos/modules/services/security/kanidm.nix @@ -0,0 +1,345 @@ +{ config, lib, options, pkgs, ... }: +let + cfg = config.services.kanidm; + settingsFormat = pkgs.formats.toml { }; + # Remove null values, so we can document optional values that don't end up in the generated TOML file. + filterConfig = lib.converge (lib.filterAttrsRecursive (_: v: v != null)); + serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings); + clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings); + unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings); + + defaultServiceConfig = { + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + ]; + CapabilityBoundingSet = ""; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + # Implies ProtectSystem=strict, which re-mounts all paths + # DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectHome = true; + ProtectHostname = true; + # Would re-mount paths ignored by temporary root + #ProtectSystem = "strict"; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + # Does not work well with the temporary root + #UMask = "0066"; + }; + +in +{ + options.services.kanidm = { + enableClient = lib.mkEnableOption "the Kanidm client"; + enableServer = lib.mkEnableOption "the Kanidm server"; + enablePam = lib.mkEnableOption "the Kanidm PAM and NSS integration."; + + serverSettings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + bindaddress = lib.mkOption { + description = "Address/port combination the webserver binds to."; + example = "[::1]:8443"; + type = lib.types.str; + }; + # Should be optional but toml does not accept null + ldapbindaddress = lib.mkOption { + description = '' + Address and port the LDAP server is bound to. Setting this to <literal>null</literal> disables the LDAP interface. + ''; + example = "[::1]:636"; + default = null; + type = lib.types.nullOr lib.types.str; + }; + origin = lib.mkOption { + description = "The origin of your Kanidm instance. Must have https as protocol."; + example = "https://idm.example.org"; + type = lib.types.strMatching "^https://.*"; + }; + domain = lib.mkOption { + description = '' + The <literal>domain</literal> that Kanidm manages. Must be below or equal to the domain + specified in <literal>serverSettings.origin</literal>. + This can be left at <literal>null</literal>, only if your instance has the role <literal>ReadOnlyReplica</literal>. + While it is possible to change the domain later on, it requires extra steps! + Please consider the warnings and execute the steps described + <link xlink:href="https://kanidm.github.io/kanidm/stable/administrivia.html#rename-the-domain">in the documentation</link>. + ''; + example = "example.org"; + default = null; + type = lib.types.nullOr lib.types.str; + }; + db_path = lib.mkOption { + description = "Path to Kanidm database."; + default = "/var/lib/kanidm/kanidm.db"; + readOnly = true; + type = lib.types.path; + }; + log_level = lib.mkOption { + description = "Log level of the server."; + default = "default"; + type = lib.types.enum [ "default" "verbose" "perfbasic" "perffull" ]; + }; + role = lib.mkOption { + description = "The role of this server. This affects the replication relationship and thereby available features."; + default = "WriteReplica"; + type = lib.types.enum [ "WriteReplica" "WriteReplicaNoUI" "ReadOnlyReplica" ]; + }; + }; + }; + default = { }; + description = '' + Settings for Kanidm, see + <link xlink:href="https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/server_configuration.md">the documentation</link> + and <link xlink:href="https://github.com/kanidm/kanidm/blob/master/examples/server.toml">example configuration</link> + for possible values. + ''; + }; + + clientSettings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.uri = lib.mkOption { + description = "Address of the Kanidm server."; + example = "http://127.0.0.1:8080"; + type = lib.types.str; + }; + }; + description = '' + Configure Kanidm clients, needed for the PAM daemon. See + <link xlink:href="https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/client_tools.md#kanidm-configuration">the documentation</link> + and <link xlink:href="https://github.com/kanidm/kanidm/blob/master/examples/config">example configuration</link> + for possible values. + ''; + }; + + unixSettings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.pam_allowed_login_groups = lib.mkOption { + description = "Kanidm groups that are allowed to login using PAM."; + example = "my_pam_group"; + type = lib.types.listOf lib.types.str; + }; + }; + description = '' + Configure Kanidm unix daemon. + See <link xlink:href="https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/pam_and_nsswitch.md#the-unix-daemon">the documentation</link> + and <link xlink:href="https://github.com/kanidm/kanidm/blob/master/examples/unixd">example configuration</link> + for possible values. + ''; + }; + }; + + config = lib.mkIf (cfg.enableClient || cfg.enableServer || cfg.enablePam) { + assertions = + [ + { + assertion = !cfg.enableServer || ((cfg.serverSettings.tls_chain or null) == null) || (!lib.isStorePath cfg.serverSettings.tls_chain); + message = '' + <option>services.kanidm.serverSettings.tls_chain</option> points to + a file in the Nix store. You should use a quoted absolute path to + prevent this. + ''; + } + { + assertion = !cfg.enableServer || ((cfg.serverSettings.tls_key or null) == null) || (!lib.isStorePath cfg.serverSettings.tls_key); + message = '' + <option>services.kanidm.serverSettings.tls_key</option> points to + a file in the Nix store. You should use a quoted absolute path to + prevent this. + ''; + } + { + assertion = !cfg.enableClient || options.services.kanidm.clientSettings.isDefined; + message = '' + <option>services.kanidm.clientSettings</option> needs to be configured + if the client is enabled. + ''; + } + { + assertion = !cfg.enablePam || options.services.kanidm.clientSettings.isDefined; + message = '' + <option>services.kanidm.clientSettings</option> needs to be configured + for the PAM daemon to connect to the Kanidm server. + ''; + } + { + assertion = !cfg.enableServer || (cfg.serverSettings.domain == null + -> cfg.serverSettings.role == "WriteReplica" || cfg.serverSettings.role == "WriteReplicaNoUI"); + message = '' + <option>services.kanidm.serverSettings.domain</option> can only be set if this instance + is not a ReadOnlyReplica. Otherwise the db would inherit it from + the instance it follows. + ''; + } + ]; + + environment.systemPackages = lib.mkIf cfg.enableClient [ pkgs.kanidm ]; + + systemd.services.kanidm = lib.mkIf cfg.enableServer { + description = "kanidm identity management daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = defaultServiceConfig // { + StateDirectory = "kanidm"; + StateDirectoryMode = "0700"; + ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}"; + User = "kanidm"; + Group = "kanidm"; + + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + # This would otherwise override the CAP_NET_BIND_SERVICE capability. + PrivateUsers = false; + # Port needs to be exposed to the host network + PrivateNetwork = false; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + TemporaryFileSystem = "/:ro"; + }; + environment.RUST_LOG = "info"; + }; + + systemd.services.kanidm-unixd = lib.mkIf cfg.enablePam { + description = "Kanidm PAM daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + restartTriggers = [ unixConfigFile clientConfigFile ]; + serviceConfig = defaultServiceConfig // { + CacheDirectory = "kanidm-unixd"; + CacheDirectoryMode = "0700"; + RuntimeDirectory = "kanidm-unixd"; + ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd"; + User = "kanidm-unixd"; + Group = "kanidm-unixd"; + + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + "-/etc/kanidm" + "-/etc/static/kanidm" + ]; + BindPaths = [ + # To create the socket + "/run/kanidm-unixd:/var/run/kanidm-unixd" + ]; + # Needs to connect to kanidmd + PrivateNetwork = false; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + TemporaryFileSystem = "/:ro"; + }; + environment.RUST_LOG = "info"; + }; + + systemd.services.kanidm-unixd-tasks = lib.mkIf cfg.enablePam { + description = "Kanidm PAM home management daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "kanidm-unixd.service" ]; + partOf = [ "kanidm-unixd.service" ]; + restartTriggers = [ unixConfigFile clientConfigFile ]; + serviceConfig = { + ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd_tasks"; + + BindReadOnlyPaths = [ + "/nix/store" + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + "-/etc/kanidm" + "-/etc/static/kanidm" + ]; + BindPaths = [ + # To manage home directories + "/home" + # To connect to kanidm-unixd + "/run/kanidm-unixd:/var/run/kanidm-unixd" + ]; + # CAP_DAC_OVERRIDE is needed to ignore ownership of unixd socket + CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_DAC_READ_SEARCH" ]; + IPAddressDeny = "any"; + # Need access to users + PrivateUsers = false; + # Need access to home directories + ProtectHome = false; + RestrictAddressFamilies = [ "AF_UNIX" ]; + TemporaryFileSystem = "/:ro"; + }; + environment.RUST_LOG = "info"; + }; + + # These paths are hardcoded + environment.etc = lib.mkMerge [ + (lib.mkIf options.services.kanidm.clientSettings.isDefined { + "kanidm/config".source = clientConfigFile; + }) + (lib.mkIf cfg.enablePam { + "kanidm/unixd".source = unixConfigFile; + }) + ]; + + system.nssModules = lib.mkIf cfg.enablePam [ pkgs.kanidm ]; + + system.nssDatabases.group = lib.optional cfg.enablePam "kanidm"; + system.nssDatabases.passwd = lib.optional cfg.enablePam "kanidm"; + + users.groups = lib.mkMerge [ + (lib.mkIf cfg.enableServer { + kanidm = { }; + }) + (lib.mkIf cfg.enablePam { + kanidm-unixd = { }; + }) + ]; + users.users = lib.mkMerge [ + (lib.mkIf cfg.enableServer { + kanidm = { + description = "Kanidm server"; + isSystemUser = true; + group = "kanidm"; + packages = with pkgs; [ kanidm ]; + }; + }) + (lib.mkIf cfg.enablePam { + kanidm-unixd = { + description = "Kanidm PAM daemon"; + isSystemUser = true; + group = "kanidm-unixd"; + }; + }) + ]; + }; + + meta.maintainers = with lib.maintainers; [ erictapen Flakebi ]; + meta.buildDocsInSandbox = false; +} diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 4b36cc8754c61..0bfa2368787ff 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -294,7 +294,7 @@ in ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" chmod g+w "${runDir}/tmp/cache" - chown -R "${cfg.user}"."${cfg.group}" "${runDir}" + chown -R "${cfg.user}":"${cfg.group}" "${runDir}" mkdir -m 0750 -p "${cfg.dataDir}" @@ -302,9 +302,9 @@ in mkdir -m 0750 -p "${cfg.dataDir}/client/img" cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" - chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" + chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media" + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img" ${optionalString (cfg.database.host == null) '' if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 8247a7e381c90..f48eac21bd8f3 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix + ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index ad875616ac9e6..4bf78fa16e7d9 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.programs.phosh; + cfg = config.services.xserver.desktopManager.phosh; # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop oskItem = pkgs.makeDesktopItem { @@ -118,12 +118,39 @@ let [cursor] theme = ${phoc.cursorTheme} ''; -in { +in + +{ options = { - programs.phosh = { - enable = mkEnableOption '' - Whether to enable, Phosh, related packages and default configurations. - ''; + services.xserver.desktopManager.phosh = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Phone Shell."; + }; + + package = mkOption { + type = types.package; + default = pkgs.phosh; + defaultText = literalExpression "pkgs.phosh"; + example = literalExpression "pkgs.phosh"; + description = '' + Package that should be used for Phosh. + ''; + }; + + user = mkOption { + description = "The user to run the Phosh service."; + type = types.str; + example = "alice"; + }; + + group = mkOption { + description = "The group to run the Phosh service."; + type = types.str; + example = "users"; + }; + phocConfig = mkOption { description = '' Configurations for the Phoc compositor. @@ -135,14 +162,42 @@ in { }; config = mkIf cfg.enable { + systemd.defaultUnit = "graphical.target"; + # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service + systemd.services.phosh = { + wantedBy = [ "graphical.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/phosh"; + User = cfg.user; + Group = cfg.group; + PAMName = "login"; + WorkingDirectory = "~"; + Restart = "always"; + + TTYPath = "/dev/tty7"; + TTYReset = "yes"; + TTYVHangup = "yes"; + TTYVTDisallocate = "yes"; + + # Fail to start if not controlling the tty. + StandardInput = "tty-fail"; + StandardOutput = "journal"; + StandardError = "journal"; + + # Log this user with utmp, letting it show up with commands 'w' and 'who'. + UtmpIdentifier = "tty7"; + UtmpMode = "user"; + }; + }; + environment.systemPackages = [ pkgs.phoc - pkgs.phosh + cfg.package pkgs.squeekboard oskItem ]; - systemd.packages = [ pkgs.phosh ]; + systemd.packages = [ cfg.package ]; programs.feedbackd.enable = true; @@ -152,7 +207,7 @@ in { services.gnome.core-shell.enable = true; services.gnome.core-os-services.enable = true; - services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; + services.xserver.displayManager.sessionPackages = [ cfg.package ]; environment.etc."phosh/phoc.ini".source = if builtins.isPath cfg.phocConfig then cfg.phocConfig diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index d1a6f46bfc408..0336930b3ab7d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -779,6 +779,7 @@ let "RouteDenyList" "RouteAllowList" "DHCPv6Client" + "RouteMetric" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 78ae8e9d20b77..8b57cae3c40da 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -4,7 +4,10 @@ with lib; let - inherit (pkgs) plymouth nixos-icons; + inherit (pkgs) nixos-icons; + plymouth = pkgs.plymouth.override { + systemd = config.boot.initrd.systemd.package; + }; cfg = config.boot.plymouth; opt = options.boot.plymouth; @@ -143,7 +146,88 @@ in systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; - boot.initrd.extraUtilsCommands = '' + boot.initrd.systemd = { + extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell + storePaths = [ + "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent" + "${plymouth}/bin/plymouthd" + "${plymouth}/sbin/plymouthd" + ]; + packages = [ plymouth ]; # systemd units + contents = { + # Files + "/etc/plymouth/plymouthd.conf".source = configFile; + "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; + "/etc/plymouth/logo.png".source = cfg.logo; + # Directories + "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" {} '' + # Check if the actual requested theme is here + if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then + echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + exit 1 + fi + + moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)" + + mkdir -p $out/renderers + # module might come from a theme + cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out + cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/renderers + ''; + "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" {} '' + # Check if the actual requested theme is here + if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then + echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages" + exit 1 + fi + + mkdir $out + cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme} $out + # Copy more themes if the theme depends on others + for theme in $(grep -hRo '/etc/plymouth/themes/.*$' ${themesEnv} | xargs -n1 basename); do + if [[ -d "${themesEnv}/theme" ]]; then + cp -r "${themesEnv}/theme" $out + fi + done + ''; + + # Fonts + "/etc/plymouth/fonts".source = pkgs.runCommand "plymouth-initrd-fonts" {} '' + mkdir -p $out + cp ${cfg.font} $out + ''; + "/etc/fonts/fonts.conf".text = '' + <?xml version="1.0"?> + <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> + <fontconfig> + <dir>/etc/plymouth/fonts</dir> + </fontconfig> + ''; + }; + # Properly enable units. These are the units that arch copies + services = { + plymouth-halt.wantedBy = [ "halt.target" ]; + plymouth-kexec.wantedBy = [ "kexec.target" ]; + plymouth-poweroff.wantedBy = [ "poweroff.target" ]; + plymouth-quit-wait.wantedBy = [ "multi-user.target" ]; + plymouth-quit.wantedBy = [ "multi-user.target" ]; + plymouth-read-write.wantedBy = [ "sysinit.target" ]; + plymouth-reboot.wantedBy = [ "reboot.target" ]; + plymouth-start.wantedBy = [ "initrd-switch-root.target" "sysinit.target" ]; + plymouth-switch-root-initramfs.wantedBy = [ "halt.target" "kexec.target" "plymouth-switch-root-initramfs.service" "poweroff.target" "reboot.target" ]; + plymouth-switch-root.wantedBy = [ "initrd-switch-root.target" ]; + }; + }; + + # Insert required udev rules. We take stage 2 systemd because the udev + # rules are only generated when building with logind. + boot.initrd.services.udev.packages = [ (pkgs.runCommand "initrd-plymouth-udev-rules" {} '' + mkdir -p $out/etc/udev/rules.d + cp ${config.systemd.package.out}/lib/udev/rules.d/{70-uaccess,71-seat}.rules $out/etc/udev/rules.d + sed -i '/loginctl/d' $out/etc/udev/rules.d/71-seat.rules + '') ]; + + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${plymouth}/bin/plymouth copy_bin_and_libs ${plymouth}/bin/plymouthd @@ -198,18 +282,18 @@ in EOF ''; - boot.initrd.extraUtilsCommandsTest = '' + boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.enable) '' $out/bin/plymouthd --help >/dev/null $out/bin/plymouth --help >/dev/null ''; - boot.initrd.extraUdevRulesCommands = '' + boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.enable) '' cp ${config.systemd.package}/lib/udev/rules.d/{70-uaccess,71-seat}.rules $out sed -i '/loginctl/d' $out/71-seat.rules ''; # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen. - boot.initrd.preLVMCommands = mkAfter '' + boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.enable) (mkAfter '' mkdir -p /etc/plymouth mkdir -p /run/plymouth ln -s ${configFile} /etc/plymouth/plymouthd.conf @@ -221,16 +305,16 @@ in plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session plymouth show-splash - ''; + ''); - boot.initrd.postMountCommands = '' + boot.initrd.postMountCommands = mkIf (!config.boot.initrd.enable) '' plymouth update-root-fs --new-root-dir="$targetRoot" ''; # `mkBefore` to ensure that any custom prompts would be visible. - boot.initrd.preFailCommands = mkBefore '' + boot.initrd.preFailCommands = mkIf (!config.boot.initrd.enable) (mkBefore '' plymouth quit --wait - ''; + ''); }; diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix index bf9995d03cc18..da03c60db5281 100644 --- a/nixos/modules/system/boot/systemd/nspawn.nix +++ b/nixos/modules/system/boot/systemd/nspawn.nix @@ -16,7 +16,7 @@ let "LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS" "LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME" "OOMScoreAdjust" "CPUAffinity" "Hostname" "ResolvConf" "Timezone" - "LinkJournal" + "LinkJournal" "Ephemeral" "AmbientCapability" ]) (assertValueOneOf "Boot" boolValues) (assertValueOneOf "ProcessTwo" boolValues) @@ -26,11 +26,13 @@ let checkFiles = checkUnitConfig "Files" [ (assertOnlyFields [ "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem" - "Overlay" "OverlayReadOnly" "PrivateUsersChown" + "Overlay" "OverlayReadOnly" "PrivateUsersChown" "BindUser" + "Inaccessible" "PrivateUserOwnership" ]) (assertValueOneOf "ReadOnly" boolValues) (assertValueOneOf "Volatile" (boolValues ++ [ "state" ])) (assertValueOneOf "PrivateUsersChown" boolValues) + (assertValueOneOf "PrivateUserOwnership" [ "off" "chown" "map" "auto" ]) ]; checkNetwork = checkUnitConfig "Network" [ diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 5eca68798d5d8..c8bbfe9769b21 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -58,6 +58,13 @@ let # latter case it makes one last attempt at importing, allowing the system to # (eventually) boot even with a degraded pool. importLib = {zpoolCmd, awkCmd, cfgZfs}: '' + for o in $(cat /proc/cmdline); do + case $o in + zfs_force|zfs_force=1|zfs_force=y) + ZFS_FORCE="-f" + ;; + esac + done poolReady() { pool="$1" state="$("${zpoolCmd}" import 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" @@ -78,6 +85,95 @@ let } ''; + getPoolFilesystems = pool: + filter (x: x.fsType == "zfs" && (fsToPool x) == pool) config.system.build.fileSystems; + + getPoolMounts = prefix: pool: + let + # Remove the "/" suffix because even though most mountpoints + # won't have it, the "/" mountpoint will, and we can't have the + # trailing slash in "/sysroot/" in stage 1. + mountPoint = fs: escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint)); + in + map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); + + getKeyLocations = pool: + if isBool cfgZfs.requestEncryptionCredentials + then "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}" + else "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)}"; + + createImportService = { pool, systemd, force, prefix ? "" }: + nameValuePair "zfs-import-${pool}" { + description = "Import ZFS pool \"${pool}\""; + # we need systemd-udev-settle to ensure devices are available + # In the future, hopefully someone will complete this: + # https://github.com/zfsonlinux/zfs/pull/4943 + requires = [ "systemd-udev-settle.service" ]; + after = [ + "systemd-udev-settle.service" + "systemd-modules-load.service" + "systemd-ask-password-console.service" + ]; + wantedBy = (getPoolMounts prefix pool) ++ [ "local-fs.target" ]; + before = (getPoolMounts prefix pool) ++ [ "local-fs.target" ]; + unitConfig = { + DefaultDependencies = "no"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + environment.ZFS_FORCE = optionalString force "-f"; + script = (importLib { + # See comments at importLib definition. + zpoolCmd = "${cfgZfs.package}/sbin/zpool"; + awkCmd = "${pkgs.gawk}/bin/awk"; + inherit cfgZfs; + }) + '' + poolImported "${pool}" && exit + echo -n "importing ZFS pool \"${pool}\"..." + # Loop across the import until it succeeds, because the devices needed may not be discovered yet. + for trial in `seq 1 60`; do + poolReady "${pool}" && poolImport "${pool}" && break + sleep 1 + done + poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. + if poolImported "${pool}"; then + ${optionalString (if isBool cfgZfs.requestEncryptionCredentials + then cfgZfs.requestEncryptionCredentials + else cfgZfs.requestEncryptionCredentials != []) '' + ${getKeyLocations pool} | while IFS=$'\t' read ds kl ks; do + { + if [[ "$ks" != unavailable ]]; then + continue + fi + case "$kl" in + none ) + ;; + prompt ) + tries=3 + success=false + while [[ $success != true ]] && [[ $tries -gt 0 ]]; do + ${systemd}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ + && success=true \ + || tries=$((tries - 1)) + done + [[ $success = true ]] + ;; + * ) + ${cfgZfs.package}/sbin/zfs load-key "$ds" + ;; + esac + } < /dev/null # To protect while read ds kl in case anything reads stdin + done + ''} + echo "Successfully imported ${pool}" + else + exit 1 + fi + ''; + }; + zedConf = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault { mkValueString = v: @@ -428,14 +524,6 @@ in ''; postDeviceCommands = concatStringsSep "\n" (['' ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" - - for o in $(cat /proc/cmdline); do - case $o in - zfs_force|zfs_force=1) - ZFS_FORCE="-f" - ;; - esac - done ''] ++ [(importLib { # See comments at importLib definition. zpoolCmd = "zpool"; @@ -464,6 +552,21 @@ in zfs load-key ${fs} '') cfgZfs.requestEncryptionCredentials} '') rootPools)); + + # Systemd in stage 1 + systemd = { + packages = [cfgZfs.package]; + services = listToAttrs (map (pool: createImportService { + inherit pool; + systemd = config.boot.initrd.systemd.package; + force = cfgZfs.forceImportRoot; + prefix = "/sysroot"; + }) rootPools); + extraBin = { + # zpool and zfs are already in thanks to fsPackages + awk = "${pkgs.gawk}/bin/awk"; + }; + }; }; systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/zpool".source = pkgs.writeShellScript "zpool-sync-shutdown" '' @@ -521,79 +624,11 @@ in systemd.packages = [ cfgZfs.package ]; systemd.services = let - getPoolFilesystems = pool: - filter (x: x.fsType == "zfs" && (fsToPool x) == pool) config.system.build.fileSystems; - - getPoolMounts = pool: - let - mountPoint = fs: escapeSystemdPath fs.mountPoint; - in - map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); - - createImportService = pool: - nameValuePair "zfs-import-${pool}" { - description = "Import ZFS pool \"${pool}\""; - # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged - requires = [ "systemd-udev-settle.service" ]; - after = [ - "systemd-udev-settle.service" - "systemd-modules-load.service" - "systemd-ask-password-console.service" - ]; - wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; - before = (getPoolMounts pool) ++ [ "local-fs.target" ]; - unitConfig = { - DefaultDependencies = "no"; - }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f"; - script = (importLib { - # See comments at importLib definition. - zpoolCmd = "${cfgZfs.package}/sbin/zpool"; - awkCmd = "${pkgs.gawk}/bin/awk"; - inherit cfgZfs; - }) + '' - poolImported "${pool}" && exit - echo -n "importing ZFS pool \"${pool}\"..." - # Loop across the import until it succeeds, because the devices needed may not be discovered yet. - for trial in `seq 1 60`; do - poolReady "${pool}" && poolImport "${pool}" && break - sleep 1 - done - poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. - if poolImported "${pool}"; then - ${optionalString (if isBool cfgZfs.requestEncryptionCredentials - then cfgZfs.requestEncryptionCredentials - else cfgZfs.requestEncryptionCredentials != []) '' - ${cfgZfs.package}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do - { - ${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' - if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then - continue - fi - ''} - case "$kl" in - none ) - ;; - prompt ) - ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" - ;; - * ) - ${cfgZfs.package}/sbin/zfs load-key "$ds" - ;; - esac - } < /dev/null # To protect while read ds kl in case anything reads stdin - done - ''} - echo "Successfully imported ${pool}" - else - exit 1 - fi - ''; - }; + createImportService' = pool: createImportService { + inherit pool; + systemd = config.systemd.package; + force = cfgZfs.forceImportAll; + }; # This forces a sync of any ZFS pools prior to poweroff, even if they're set # to sync=disabled. @@ -619,7 +654,7 @@ in wantedBy = [ "zfs.target" ]; }; - in listToAttrs (map createImportService dataPools ++ + in listToAttrs (map createImportService' dataPools ++ map createSyncService allPools ++ map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]); diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8654539b6629c..110e84494a3dc 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -43,12 +43,6 @@ in } { assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; message = "networking.defaultGateway6.interface is not supported by networkd."; - } { - assertion = cfg.useDHCP == false; - message = '' - networking.useDHCP is not supported by networkd. - Please use per interface configuration and set the global option to false. - ''; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; @@ -80,6 +74,42 @@ in in mkMerge [ { enable = true; } + (mkIf cfg.useDHCP { + networks."99-ethernet-default-dhcp" = lib.mkIf cfg.useDHCP { + # We want to match physical ethernet interfaces as commonly + # found on laptops, desktops and servers, to provide an + # "out-of-the-box" setup that works for common cases. This + # heuristic isn't perfect (it could match interfaces with + # custom names that _happen_ to start with en or eth), but + # should be good enough to make the common case easy and can + # be overridden on a case-by-case basis using + # higher-priority networks or by disabling useDHCP. + + # Type=ether matches veth interfaces as well, and this is + # more likely to result in interfaces being configured to + # use DHCP when they shouldn't. + + # We set RequiredForOnline to false, because it's fairly + # common for such devices to have multiple interfaces and + # only one of them to be connected (e.g. a laptop with + # ethernet and WiFi interfaces). Maybe one day networkd will + # support "any"-style RequiredForOnline... + matchConfig.Name = ["en*" "eth*"]; + DHCP = "yes"; + linkConfig.RequiredForOnline = lib.mkDefault false; + }; + networks."99-wireless-client-dhcp" = lib.mkIf cfg.useDHCP { + # Like above, but this is much more likely to be correct. + matchConfig.WLANInterfaceType = "station"; + DHCP = "yes"; + linkConfig.RequiredForOnline = lib.mkDefault false; + # We also set the route metric to one more than the default + # of 1024, so that Ethernet is preferred if both are + # available. + dhcpV4Config.RouteMetric = 1025; + ipv6AcceptRAConfig.RouteMetric = 1025; + }; + }) (mkMerge (forEach interfaces (i: { netdevs = mkIf i.virtual ({ "40-${i.name}" = { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index d09e9b99248d8..d56159f15960d 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1254,11 +1254,6 @@ in Whether to use DHCP to obtain an IP address and other configuration for all network interfaces that are not manually configured. - - Using this option is highly discouraged and also incompatible with - <option>networking.useNetworkd</option>. Please use - <option>networking.interfaces.<name>.useDHCP</option> instead - and set this to false. ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 81541477b9e09..4ab2578eb81e6 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -129,6 +129,9 @@ in # Make sure we use the Guest Agent from the QEMU package for testing # to reduce the closure size required for the tests. services.qemuGuest.package = pkgs.qemu_test.ga; + + # Squelch warning about unset system.stateVersion + system.stateVersion = lib.mkDefault lib.trivial.release; }; } diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix index 3913b474afbee..9b9f99e5b8172 100644 --- a/nixos/modules/virtualisation/proxmox-lxc.nix +++ b/nixos/modules/virtualisation/proxmox-lxc.nix @@ -20,6 +20,15 @@ with lib; configuration from proxmox. ''; }; + manageHostName = mkOption { + type = types.bool; + default = false; + description = '' + Whether to manage hostname through nix options + When false, the hostname is picked up from /etc/hostname + populated by proxmox. + ''; + }; }; config = @@ -50,6 +59,8 @@ with lib; useDHCP = false; useHostResolvConf = false; useNetworkd = true; + # pick up hostname from /etc/hostname generated by proxmox + hostName = mkIf (!cfg.manageHostName) (mkForce ""); }; services.openssh = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 923464a0c9a3e..0c085b64efa90 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -253,6 +253,7 @@ in k3s-single-node = handleTest ./k3s-single-node.nix {}; k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {}; kafka = handleTest ./kafka.nix {}; + kanidm = handleTest ./kanidm.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; kbd-update-search-paths-patch = handleTest ./kbd-update-search-paths-patch.nix {}; kea = handleTest ./kea.nix {}; @@ -284,7 +285,6 @@ in loki = handleTest ./loki.nix {}; lvm2 = handleTest ./lvm2 {}; lxd = handleTest ./lxd.nix {}; - lxd-image = handleTest ./lxd-image.nix {}; lxd-nftables = handleTest ./lxd-nftables.nix {}; lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; diff --git a/nixos/tests/common/lxd/config.yaml b/nixos/tests/common/lxd/config.yaml new file mode 100644 index 0000000000000..3bb667ed43f7c --- /dev/null +++ b/nixos/tests/common/lxd/config.yaml @@ -0,0 +1,24 @@ +storage_pools: + - name: default + driver: dir + config: + source: /var/lxd-pool + +networks: + - name: lxdbr0 + type: bridge + config: + ipv4.address: auto + ipv6.address: none + +profiles: + - name: default + devices: + eth0: + name: eth0 + network: lxdbr0 + type: nic + root: + path: / + pool: default + type: disk diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index fd16b481168f4..c6fb37cfe5842 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -106,6 +106,5 @@ in malcontent = callInstalledTest ./malcontent.nix {}; ostree = callInstalledTest ./ostree.nix {}; pipewire = callInstalledTest ./pipewire.nix {}; - power-profiles-daemon = callInstalledTest ./power-profiles-daemon.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; } diff --git a/nixos/tests/installed-tests/power-profiles-daemon.nix b/nixos/tests/installed-tests/power-profiles-daemon.nix deleted file mode 100644 index 43629a0155d24..0000000000000 --- a/nixos/tests/installed-tests/power-profiles-daemon.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, lib, makeInstalledTest, ... }: - -makeInstalledTest { - tested = pkgs.power-profiles-daemon; - - testConfig = { - services.power-profiles-daemon.enable = true; - }; -} diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index a8b418626e660..d02387ee80e09 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -27,7 +27,7 @@ simpleUefiGrubSpecialisation simpleUefiSystemdBoot # swraid - # zfsroot + zfsroot ; } diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix new file mode 100644 index 0000000000000..d34f680f5224b --- /dev/null +++ b/nixos/tests/kanidm.nix @@ -0,0 +1,75 @@ +import ./make-test-python.nix ({ pkgs, ... }: + let + certs = import ./common/acme/server/snakeoil-certs.nix; + serverDomain = certs.domain; + in + { + name = "kanidm"; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi ]; + + nodes.server = { config, pkgs, lib, ... }: { + services.kanidm = { + enableServer = true; + serverSettings = { + origin = "https://${serverDomain}"; + domain = serverDomain; + bindaddress = "[::1]:8443"; + ldapbindaddress = "[::1]:636"; + }; + }; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."${serverDomain}" = { + forceSSL = true; + sslCertificate = certs."${serverDomain}".cert; + sslCertificateKey = certs."${serverDomain}".key; + locations."/".proxyPass = "http://[::1]:8443"; + }; + }; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.hosts."::1" = [ serverDomain ]; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + users.users.kanidm.shell = pkgs.bashInteractive; + + environment.systemPackages = with pkgs; [ kanidm openldap ripgrep ]; + }; + + nodes.client = { pkgs, nodes, ... }: { + services.kanidm = { + enableClient = true; + clientSettings = { + uri = "https://${serverDomain}"; + }; + }; + + networking.hosts."${nodes.server.config.networking.primaryIPAddress}" = [ serverDomain ]; + + security.pki.certificateFiles = [ certs.ca.cert ]; + }; + + testScript = { nodes, ... }: + let + ldapBaseDN = builtins.concatStringsSep "," (map (s: "dc=" + s) (pkgs.lib.splitString "." serverDomain)); + + # We need access to the config file in the test script. + filteredConfig = pkgs.lib.converge + (pkgs.lib.filterAttrsRecursive (_: v: v != null)) + nodes.server.config.services.kanidm.serverSettings; + serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig; + + in + '' + start_all() + server.wait_for_unit("kanidm.service") + server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") + server.wait_until_succeeds("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'") + client.wait_until_succeeds("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}") + (rv, result) = server.execute("kanidmd recover_account -d quiet -c ${serverConfigFile} -n admin 2>&1 | rg -o '[A-Za-z0-9]{48}'") + assert rv == 0 + ''; + }) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index f34d5d6079404..1e60198abdd04 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,6 +30,7 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened + linux_5_17_hardened linux_testing; }; diff --git a/nixos/tests/lxd-image-server.nix b/nixos/tests/lxd-image-server.nix index fa40e33e74dd6..072f4570c2c9f 100644 --- a/nixos/tests/lxd-image-server.nix +++ b/nixos/tests/lxd-image-server.nix @@ -1,54 +1,21 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ... } : let - # Since we don't have access to the internet during the tests, we have to - # pre-fetch lxd containers beforehand. - # - # I've chosen to import Alpine Linux, because its image is turbo-tiny and, - # generally, sufficient for our tests. - alpine-meta = pkgs.fetchurl { - url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; - hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; - }; - - alpine-rootfs = pkgs.fetchurl { - url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; - hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; + lxd-image = import ../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; }; - lxd-config = pkgs.writeText "config.yaml" '' - storage_pools: - - name: default - driver: dir - config: - source: /var/lxd-pool - - networks: - - name: lxdbr0 - type: bridge - config: - ipv4.address: auto - ipv6.address: none - - profiles: - - name: default - devices: - eth0: - name: eth0 - network: lxdbr0 - type: nic - root: - path: / - pool: default - type: disk - ''; - + lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system}; + lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system}; in { name = "lxd-image-server"; meta = with pkgs.lib.maintainers; { - maintainers = [ mkg20001 ]; + maintainers = [ mkg20001 patryk27 ]; }; nodes.machine = { lib, ... }: { @@ -100,20 +67,20 @@ in { # lxd expects the pool's directory to already exist machine.succeed("mkdir /var/lxd-pool") - machine.succeed( - "cat ${lxd-config} | lxd init --preseed" + "cat ${./common/lxd/config.yaml} | lxd init --preseed" ) machine.succeed( - "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine" + "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos" ) - loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1" + loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1" with subtest("push image to server"): - machine.succeed("lxc launch alpine test") - machine.succeed("lxc stop test") + machine.succeed("lxc launch nixos test") + machine.sleep(5) + machine.succeed("lxc stop -f test") machine.succeed("lxc publish --public test --alias=testimg") machine.succeed("lxc image export testimg") machine.succeed("ls >&2") diff --git a/nixos/tests/lxd-image.nix b/nixos/tests/lxd-image.nix deleted file mode 100644 index 4930b55f19094..0000000000000 --- a/nixos/tests/lxd-image.nix +++ /dev/null @@ -1,89 +0,0 @@ -# This test ensures that the nixOS lxd images builds and functions properly -# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software - -import ./make-test-python.nix ({ pkgs, ...} : let - release = import ../release.nix { - /* configuration = { - environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works - }; */ - }; - - metadata = release.lxdMeta.${pkgs.system}; - image = release.lxdImage.${pkgs.system}; - - lxd-config = pkgs.writeText "config.yaml" '' - storage_pools: - - name: default - driver: dir - config: - source: /var/lxd-pool - - networks: - - name: lxdbr0 - type: bridge - config: - ipv4.address: auto - ipv6.address: none - - profiles: - - name: default - devices: - eth0: - name: eth0 - network: lxdbr0 - type: nic - root: - path: / - pool: default - type: disk - ''; -in { - name = "lxd-image"; - - meta = with pkgs.lib.maintainers; { - maintainers = [ mkg20001 ]; - }; - - nodes.machine = { lib, ... }: { - virtualisation = { - # disk full otherwise - diskSize = 2048; - - lxc.lxcfs.enable = true; - lxd.enable = true; - }; - }; - - testScript = '' - machine.wait_for_unit("sockets.target") - machine.wait_for_unit("lxd.service") - machine.wait_for_file("/var/lib/lxd/unix.socket") - - # It takes additional second for lxd to settle - machine.sleep(1) - - # lxd expects the pool's directory to already exist - machine.succeed("mkdir /var/lxd-pool") - - machine.succeed( - "cat ${lxd-config} | lxd init --preseed" - ) - - # TODO: test custom built container aswell - - with subtest("importing container works"): - machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos") - - with subtest("launching container works"): - machine.succeed("lxc launch nixos machine -c security.nesting=true") - # make sure machine boots up properly - machine.sleep(5) - - with subtest("container shell works"): - machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -") - machine.succeed("lxc exec machine /run/current-system/sw/bin/true") - - # with subtest("rebuilding works"): - # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch") - ''; -}) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index 162bbcc47e871..15d16564d641c 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -1,79 +1,18 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ... } : let - # Since we don't have access to the internet during the tests, we have to - # pre-fetch lxd containers beforehand. - # - # I've chosen to import Alpine Linux, because its image is turbo-tiny and, - # generally, sufficient for our tests. - alpine-meta-x86 = pkgs.fetchurl { - url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; - hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; - }; - alpine-meta-for = arch: pkgs.stdenv.mkDerivation { - name = "alpine-meta-${arch}"; - version = "3.12"; - unpackPhase = "true"; - buildPhase = '' - runHook preBuild - - tar xvf ${alpine-meta-x86} - sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml - - runHook postBuild - ''; - installPhase = '' - runHook preInstall - - tar czRf $out * - - runHook postInstall - ''; - }; + lxd-image = import ../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; - alpine-meta = { - x86_64-linux = alpine-meta-x86; - aarch64-linux = alpine-meta-for "aarch64"; - }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}"); - - alpine-rootfs = { - x86_64-linux = pkgs.fetchurl { - url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; - hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; - }; - aarch64-linux = pkgs.fetchurl { - url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz"; - hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us="; + # Our tests require `grep` & friends: + environment.systemPackages = with pkgs; [ busybox ]; }; - }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}"); - - lxd-config = pkgs.writeText "config.yaml" '' - storage_pools: - - name: default - driver: dir - config: - source: /var/lxd-pool - - networks: - - name: lxdbr0 - type: bridge - config: - ipv4.address: auto - ipv6.address: none - - profiles: - - name: default - devices: - eth0: - name: eth0 - network: lxdbr0 - type: nic - root: - path: / - pool: default - type: disk - ''; + }; + lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system}; + lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system}; in { name = "lxd"; @@ -84,6 +23,8 @@ in { nodes.machine = { lib, ... }: { virtualisation = { + diskSize = 2048; + # Since we're testing `limits.cpu`, we've gotta have a known number of # cores to lean on cores = 2; @@ -108,61 +49,66 @@ in { machine.succeed("mkdir /var/lxd-pool") machine.succeed( - "cat ${lxd-config} | lxd init --preseed" + "cat ${./common/lxd/config.yaml} | lxd init --preseed" ) machine.succeed( - "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine" + "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos" ) - with subtest("Containers can be launched and destroyed"): - machine.succeed("lxc launch alpine test") - machine.succeed("lxc exec test true") - machine.succeed("lxc delete -f test") + with subtest("Container can be managed"): + machine.succeed("lxc launch nixos container") + machine.sleep(5) + machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") + machine.succeed("lxc exec container true") + machine.succeed("lxc delete -f container") - with subtest("Containers are being mounted with lxcfs inside"): - machine.succeed("lxc launch alpine test") + with subtest("Container is mounted with lxcfs inside"): + machine.succeed("lxc launch nixos container") + machine.sleep(5) ## ---------- ## ## limits.cpu ## - machine.succeed("lxc config set test limits.cpu 1") - machine.succeed("lxc restart test") + machine.succeed("lxc config set container limits.cpu 1") + machine.succeed("lxc restart container") + machine.sleep(5) - # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort - # to the primal methods assert ( "1" - == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip() + == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip() ) - machine.succeed("lxc config set test limits.cpu 2") - machine.succeed("lxc restart test") + machine.succeed("lxc config set container limits.cpu 2") + machine.succeed("lxc restart container") + machine.sleep(5) assert ( "2" - == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip() + == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip() ) ## ------------- ## ## limits.memory ## - machine.succeed("lxc config set test limits.memory 64MB") - machine.succeed("lxc restart test") + machine.succeed("lxc config set container limits.memory 64MB") + machine.succeed("lxc restart container") + machine.sleep(5) assert ( "MemTotal: 62500 kB" - == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip() + == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip() ) - machine.succeed("lxc config set test limits.memory 128MB") - machine.succeed("lxc restart test") + machine.succeed("lxc config set container limits.memory 128MB") + machine.succeed("lxc restart container") + machine.sleep(5) assert ( "MemTotal: 125000 kB" - == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip() + == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip() ) - machine.succeed("lxc delete -f test") + machine.succeed("lxc delete -f container") ''; }) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index a1150097a0917..2cc1e9b0942ca 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -139,6 +139,26 @@ let client.wait_until_succeeds("ping -c 1 192.168.3.1") ''; }; + dhcpDefault = { + name = "useDHCP-by-default"; + nodes.router = router; + nodes.client = { lib, ... }: { + # Disable test driver default config + networking.interfaces = lib.mkForce {}; + networking.useNetworkd = networkd; + virtualisation.vlans = [ 1 ]; + }; + testScript = '' + start_all() + client.wait_for_unit("multi-user.target") + client.wait_until_succeeds("ip addr show dev eth1 | grep '192.168.1'") + client.shell_interact() + client.succeed("ping -c 1 192.168.1.1") + router.succeed("ping -c 1 192.168.1.1") + router.succeed("ping -c 1 192.168.1.2") + client.succeed("ping -c 1 192.168.1.2") + ''; + }; dhcpSimple = { name = "SimpleDHCP"; nodes.router = router; diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 90a9a25110447..8998716243a25 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -158,7 +158,9 @@ import ./make-test-python.nix ({ pkgs, ... }: # Waiting for pleroma to be up. timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w '%{http_code}' https://pleroma.nixos.test/api/v1/instance)" != "200" ]]; do sleep 2; done' - pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y + # Toremove the RELEASE_COOKIE bit when https://github.com/NixOS/nixpkgs/issues/166229 gets fixed. + RELEASE_COOKIE="/var/lib/pleroma/.cookie" \ + pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y ''; tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix index 5bf55060d2e03..c2cb92d11301c 100644 --- a/nixos/tests/systemd-nspawn.nix +++ b/nixos/tests/systemd-nspawn.nix @@ -25,8 +25,15 @@ let nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' mkdir -p $out cd $out + + # produce a testimage.raw dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5 - sha256sum testimage.raw > SHA256SUMS + + # produce a testimage2.tar.xz, containing the hello store path + tar cvJpf testimage2.tar.xz ${pkgs.hello} + + # produce signature(s) + sha256sum testimage* > SHA256SUMS export GNUPGHOME="$(mktemp -d)" cp -R ${gpgKeyring}/* $GNUPGHOME gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS @@ -56,5 +63,9 @@ in { client.succeed( "cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw" ) + client.succeed("machinectl pull-tar --verify=signature http://server/testimage2.tar.xz") + client.succeed( + "cmp /var/lib/machines/testimage2/${pkgs.hello}/bin/hello ${pkgs.hello}/bin/hello" + ) ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 27093aab96ee5..4eb402a7d36ef 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -222,7 +222,7 @@ let machine.execute(ru("VBoxManage controlvm ${name} poweroff")) machine.succeed("rm -rf ${sharePath}") machine.succeed("mkdir -p ${sharePath}") - machine.succeed("chown alice.users ${sharePath}") + machine.succeed("chown alice:users ${sharePath}") def create_vm_${name}(): diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix new file mode 100644 index 0000000000000..c3cc1a21ffc58 --- /dev/null +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }: + +stdenv.mkDerivation rec { + pname = "airwindows-lv2"; + version = "1.0"; + src = fetchFromGitHub { + owner = "hannesbraun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ lv2 ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ]; + + meta = with lib; { + description = "Airwindows plugins (ported to LV2)"; + homepage = "https://github.com/hannesbraun/airwindows-lv2"; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index f1da043d598c8..e337af93ec1ec 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -8,6 +8,7 @@ , ninja , pkg-config , reuse +, m4 , wrapGAppsHook4 , glib , gtk4 @@ -18,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.4.3"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4="; + hash = "sha256-7cwoP2Dvlrq44orckhCjFGrSVDuG8WdW8wbpAjD5zhI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4="; + hash = "sha256-CGPDaVS8F7H/tH0lRjFloWmZmW8NHheyZRCCqEavWeo="; }; postPatch = '' @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { ninja pkg-config reuse + m4 wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 2f35f1fe65ca7..0ba86567c7c8c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, fetchFromGitLab , python3 -, perl -, perlPackages +, vala +, glib , gtk3 -, intltool , libpeas , libsoup +, libxml2 , libsecret , libnotify , libdmapsharing , gnome , gobject-introspection , totem-pl-parser +, libgudev +, libgpod +, libmtp +, lirc +, brasero +, grilo , tdb , json-glib , itstool @@ -19,38 +32,32 @@ , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: -let - # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. - - # This PR would solve the issue: - # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12 - # Unfortunately applying this patch produces a rhythmbox which - # cannot fetch data from DAAP shares. - - libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec { - version = "2.9.41"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = old.pname; - rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p"; - }; - }); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; + sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo="; }; + patches = [ + # Fix stuff linking against rhythmdb not finding libxml headers + # included by rhythmdb.h header. + # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch"; + sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg="; + }) + ]; + nativeBuildInputs = [ pkg-config - intltool perl perlPackages.XMLParser + meson + ninja + vala + glib itstool wrapGAppsHook ]; @@ -58,13 +65,20 @@ in stdenv.mkDerivation rec { buildInputs = [ python3 libsoup + libxml2 tdb json-glib + glib gtk3 libpeas totem-pl-parser - gnome.adwaita-icon-theme + libgudev + libgpod + libmtp + lirc + brasero + grilo gobject-introspection python3.pkgs.pygobject3 @@ -76,16 +90,14 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - libdmapsharing_3 # necessary for daap support + libdmapsharing # for daap support libsecret libnotify ] ++ gst_plugins; - configureFlags = [ - "--enable-daap" - "--enable-libnotify" - "--with-libsecret" - ]; + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; preFixup = '' gappsWrapperArgs+=( @@ -93,8 +105,6 @@ in stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index ccbfe76719e59..d6e8de3efad63 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -13,13 +13,13 @@ trivialBuild { pname = "ement"; - version = "unstable-2022-04-22"; + version = "unstable-2022-05-05"; src = fetchFromGitHub { owner = "alphapapa"; repo = "ement.el"; - rev = "70da19e4c9210d362b1d6d9c17ab2c034a03250d"; - sha256 = "sha256-Pxul0WrtyH2XZzF0fOOitLc3x/kc+Qc11RDH0n+Hm04="; + rev = "84739451afa8355360966dfa788d469d9dc4a8e3"; + sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE="; }; packageRequires = [ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 8fc6feecd57c9..fe8666fd741bd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,7 +1,6 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , autoreconfHook , gtk-doc , vala @@ -22,22 +21,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.0"; + version = "3.40.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; + sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; }; - patches = [ - # Fix build with latest tepl. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; - sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 658c18e5cb5c4..20b18814cb755 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM="; + sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -41,9 +41,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { - expect = callPackage ./test-with-expect.nix {}; - }; + tests = { expect = callPackage ./test-with-expect.nix { }; }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/applications/editors/oed/default.nix index f4012220c50d5..a17199c2ff6aa 100644 --- a/pkgs/applications/editors/oed/default.nix +++ b/pkgs/applications/editors/oed/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ibara/oed"; description = "Portable ed editor from OpenBSD"; + homepage = "https://github.com/ibara/oed"; license = with licenses; [ bsd2 ]; + mainProgram = "ed"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 6e478693d4095..fa81414a7e72d 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -49,6 +49,7 @@ in appimageTools.wrapType2 rec { # fixup and install desktop file ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value ${pname} standard-notes.desktop + mv usr/share/icons share rm usr/lib/* AppRun standard-notes.desktop .so* ''; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index b9fcfe10221ed..a05b0e48e0be7 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem -, ncurses, libtermkey, lua -, acl ? null, libselinux ? null +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +, copyDesktopItems, makeDesktopItem +, ncurses, libtermkey, lua, tre +, acl, libselinux }: let @@ -17,12 +18,13 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; buildInputs = [ ncurses libtermkey luaEnv + tre ] ++ lib.optionals stdenv.isLinux [ acl libselinux @@ -33,28 +35,27 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications - echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; - desktopItem = makeDesktopItem { - name = "vis"; - exec = "vis %U"; - type = "Application"; - icon = "accessories-text-editor"; - comment = meta.description; - desktopName = "vis"; - genericName = "Text editor"; - categories = [ "Application" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "application/octet-stream" ]; - startupNotify = false; - terminal = true; - }; + desktopItems = [ + (makeDesktopItem { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; + }) + ]; meta = with lib; { description = "A vim like editor"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ffe7f9a336a39..db018bfb67ef8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -79,6 +79,18 @@ let }; }; + alefragnani.bookmarks = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "bookmarks"; + publisher = "alefragnani"; + version = "13.0.1"; + sha256 = "sha256-4IZCPNk7uBqPw/FKT5ypU2QxadQzYfwbGxxT/bUnKdE="; + }; + meta = { + license = lib.licenses.gpl3; + }; + }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { mktplcRef = { name = "project-manager"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f479c6686afee..3d663c39ec964 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1si0r8nww5m3yn3vzw0pk3nykfvxnlwna4pp11bsli4vqj1ym2nz"; - x86_64-darwin = "002rkvc8fa7r9x2dsjhkwzmc1sp5mq998frrw5xd6bym0cp4j76l"; - aarch64-linux = "0w9gjk2a5z8cqlg43jn2r588asymiklm1b28l54gvqp7jawlb0fd"; - aarch64-darwin = "18h2kk6fcdz38xzyn37brbbj4nbrjgzv9xsz7c7iai8d01vh7s33"; - armv7l-linux = "16cs2ald40nh76m3fxxfd233hr687dhwbqdkvjz4s6xxwi0rhvwc"; + x86_64-linux = "0ss7c0dvlgnfqi0snhx73ndzjbw24xz6pcny4v52mrd1kfhcmpvd"; + x86_64-darwin = "0ds5jv5q6k1hzrwhcgkyvx0ls9p1q7zh0fqigpxandx6ysrd7cga"; + aarch64-linux = "12zz02hdhhw19rx9kbi3yd5x81w1vs8vxjrnqqvva8bj0jnwf4iq"; + aarch64-darwin = "07ws2dc2il7ky77j5pxaxqp5cyw0v04jnv98z1494pdmxyn8gf7q"; + armv7l-linux = "0khyzc69rbfz2pnbab9v3as1hdzkzxfg3mxvf6g7ax9npvsrqw92"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.66.2"; + version = "1.67.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 41dfc3b114538..633688567aea1 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -60,6 +60,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion bobby285271 ]; + mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 92d0f5b1d3648..31f5ebc3038ca 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -77,9 +77,11 @@ stdenv.mkDerivation { chmod -R a+w externals/zstd ''; - # Todo: cubeb audio backend (the default one) doesn't work on the SDL interface. - # This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation). - # Note that the two interfaces have two separate configuration files. + # Fixes https://github.com/NixOS/nixpkgs/issues/171173 + postInstall = lib.optionalString (enableCubeb && enableSdl2) '' + wrapProgram "$out/bin/citra" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} + ''; meta = with lib; { homepage = "https://citra-emu.org"; diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index d15c99d355bb9..d070c86eef8ce 100644 --- a/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix @@ -29,10 +29,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; description = "The official emulator of CommanderX16 8-bit computer"; + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "x16emu"; inherit (SDL2.meta) platforms; }; diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 8e4d909a724ac..45bb9ed74f9f6 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -90,8 +90,9 @@ mkDerivation rec { runHook postCheck ''; + # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; meta = with lib; { @@ -102,5 +103,3 @@ mkDerivation rec { platforms = platforms.linux; }; } -# TODO: default sound backend (cubeb) does not work, but SDL does. Strangely, -# switching to cubeb while a game is running makes it work. diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 1e939538cda34..6f3409ec0637d 100644 --- a/pkgs/applications/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { dontConfigure = true; + # Workaround to build against upstream gcc-10 and clang-11. + # Can be removed when next release contains + # https://github.com/simh/simh/issues/794 + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index f93e415bcd63d..bb5019474152c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "17.4.2"; + version = "18.0.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "294f99d9060bc394490b20d2ddab75ed5c0166d7960850f065eb8897ef31a2e3"; + sha256 = "4f3893f53e47a3937320676e02337a61c358c684d5cd0b378809b3d7deab0139"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index d29d1d65346e5..75bfe5cff93d2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -80,6 +80,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; }) + + # Fix build with poppler 22.04 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; + sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index ccccca8d65c23..a496c4221a35f 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, alsa-lib , appstream-glib , desktop-file-utils , gio-sharp @@ -21,19 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.4.0"; + version = "0.5.0-hotfix-2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0="; + fetchSubmodules = true; + hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480="; + hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM="; }; nativeBuildInputs = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + alsa-lib gio-sharp glib gstreamer diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 480366921aea2..d9d21f30f3479 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.7.0-49.BETA"; + version = "8.8.0-11.BETA"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4="; + sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index c43df6b5f570c..72b542e24fe43 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.6.1"; + version = "8.7.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-CbSx1UJAvNrA1gTQyi6r8NgjwQ7H+tqWU9t3TUNrDMg="; + sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 9f3c1c82b5e04..6f55e5dd17c9d 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.4"; + version = "1.22.5"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A="; + sha256 = "sha256-EuHg8JrI6ZoyTXqD3v4cfk4/NovAj4fF2NY1V2ZF64c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 0b3ca09c6d041..dfb424ea9da56 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -1,24 +1,35 @@ { lib, stdenv - , fetchFromGitHub - , autoreconfHook - , pkg-config - , perl - , fribidi - , kbd - , xkbutils +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, perl +, fribidi +, kbd +, xkbutils }: stdenv.mkDerivation rec { pname = "bicon"; - version = "unstable-2018-09-10"; + version = "unstable-2020-06-04"; src = fetchFromGitHub { owner = "behdad"; repo = pname; - rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c"; - sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq"; + rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7"; + sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1"; }; + patches = [ + # Fix build on clang-13. Pull the change pending upstream + # inclusion: https://github.com/behdad/bicon/pull/29 + (fetchpatch { + name = "clang.patch"; + url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch"; + sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1"; + }) + ]; + buildInputs = [ fribidi kbd xkbutils perl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8f672deb693b5..753be1eb88cff 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.37.0"; + version = "5.42.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; + hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index fff8101e55a2c..494ed3001e5c1 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: +{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +, withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { pname = "catclock"; - version = "unstable-2015-10-04"; + version = "unstable-2021-11-15"; src = fetchFromGitHub { owner = "BarkyTheDog"; repo = "catclock"; - rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; - sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; + rev = "b2f277974b5a80667647303cabf8a89d6d6a4290"; + sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi"; }; preInstall = '' @@ -17,14 +18,15 @@ stdenv.mkDerivation { cp xclock.man $out/share/man/man1/xclock.1 ''; - makeFlags = [ - "DESTINATION=$(out)/bin/" - ]; + makeFlags = [ "DESTINATION=$(out)/bin/" ] + ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ]; + buildInputs = [ xlibsWrapper motif ] + ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { homepage = "http://codefromabove.com/2014/05/catclock/"; + description = "Analog / Digital / Cat clock for X"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; mainProgram = "xclock"; diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index faaea86a66401..61f0307f7c205 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "charm"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-XXKzK5MXJsB3LE7iE5BqnLm0hPs7WbyHR0x9aTldrj4="; + sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g="; }; vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4="; @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { description = "Manage your charm account on the CLI"; homepage = "https://github.com/charmbracelet/charm"; + changelog = "https://github.com/charmbracelet/charm/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; }; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 888c7892514b8..bb31be1ad27c9 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,27 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses +{ lib, stdenv, fetchFromGitHub, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; + sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU="; }; - patches = [ - # pull pending upstream inclusion fix for ncurses-6.3: - # https://github.com/dvorka/hstr/pull/435 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch"; - sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 153e50f9a873d..1fdf48ac1a0eb 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.5"; + version = "0.6.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ="; + sha256 = "r6IBvhA8H8XnMIBgZZodyU61xtqNA4N9kCRv/QWQc9M="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e48065e6d9a08..58946f227ee24 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,7 +31,7 @@ , pyyaml , requests , keyring -, python_magic +, python-magic # commands that lutris needs , xrandr @@ -104,7 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk - python_magic + python-magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -117,7 +117,7 @@ buildPythonApplication rec { pillow dbus-python keyring - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0ce8d8c373db4..fc2c2ad618d5e 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; + sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM - imagemagick ]; + buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index e8fa4d4fd379c..0ae63d210e767 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; + mainProgram = "nb"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix index 8af9d1471a089..5ad86eeccd448 100644 --- a/pkgs/applications/misc/nimbo/default.nix +++ b/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alex-eyre noreferences ]; + maintainers = with maintainers; [ alexeyre noreferences ]; }; } diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/applications/misc/oil-buku/default.nix index e0c0548828861..5f895179f1f47 100644 --- a/pkgs/applications/misc/oil-buku/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -38,7 +38,8 @@ stdenvNoCC.mkDerivation rec { description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; homepage = "https://github.com/AndreiUlmeyda/oil"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ atila ]; + mainProgram = "oil"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index f737f18d158ef..b670f85f7a60b 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "polybar"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU="; + hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE="; fetchSubmodules = true; }; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; + maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix new file mode 100644 index 0000000000000..d19d27153fa01 --- /dev/null +++ b/pkgs/applications/misc/remnote/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + pname = "remnote"; + version = "1.7.6"; + + src = fetchurl { + url = "https://download.remnote.io/RemNote-${version}.AppImage"; + sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + }; + + meta = with lib; { + description = "A note-taking application focused on learning and productivity"; + homepage = "https://remnote.com/"; + maintainers = with maintainers; [ max-niederman ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 05223aeb5c128..9729301f6e74c 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo="; + sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alex-eyre ]; + maintainers = with maintainers; [ alexeyre ]; }; } diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index ff74d8b098f3a..e3384ff6dd7f5 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.2.1"; + version = "3.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1eZ6i0CvjNyYlWb7c0OPlGtvVSFpi8hiOl/7qeeE9wA="; + sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8="; }; - cargoSha256 = "sha256-Tyrcu/BYt9k4igiEIiZ2I7VIGiBZ3D2i6XfT/XGlU+U="; + cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index a93436362adf5..c05778d6aaea3 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkg-config +, scdoc , vala , gtk3 , glib @@ -20,16 +21,16 @@ stdenv.mkDerivation rec { pname = "SwayNotificationCenter"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + hash = "sha256-Jjbr6GJ0MHlO+T/simPNYQnB5b7Cr85j4GRjRGa5B6s="; }; - nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index f2c8e6075d9d3..3ea247f4b080e 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -10,6 +10,7 @@ , gtk3 , gsettings-desktop-schemas , p7zip +, autoPatchelfHook , libXxf86vm , unzip }: @@ -41,14 +42,17 @@ let }; postPatch = '' - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so + addAutoPatchelfSearchPath ${jre8}/lib/openjdk/jre/lib/ + autoPatchelf lib + + # Nix cannot see the runtime references to the paths we just patched in + # once they've been compressed into the .jar. Scan for and remember them + # as plain text so they don't get overlooked. + find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; buildPhase = '' runHook preBuild @@ -80,6 +84,13 @@ let --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" + + # remember the store paths found inside the .jar libraries. note that + # which file they are in does not matter in particular, just that some + # file somewhere lists them in plain-text + mkdir -p $out/nix-support + cp .jar-paths $out/nix-support/depends + runHook postInstall ''; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 5a12380a4ff87..56baa1e9d8228 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber oxalica ]; + mainProgram = "task"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index be2ee1e7a8510..e46f5d2b8c1d7 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; + mainProgram = "trans"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 2c4cc1a11c096..e7299326e87db 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tut"; - version = "0.0.42"; + version = "0.0.46"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc="; + sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w="; }; vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk="; diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index 7e0fbb999f5fa..d2b5b924ea8c0 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "MPRIS proxy for usage with 'Web Media Controller' web extension"; license = licenses.unlicense; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "web-media-controller"; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 927b04d5e210f..58c0c066d8388 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -12,11 +12,11 @@ assert enablePrinting -> cups != null; stdenv.mkDerivation rec { pname = "xpdf"; - version = "4.03"; + version = "4.04"; src = fetchzip { url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz"; - sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6"; + hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY="; }; # Fix "No known features for CXX compiler", see diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ed9f16066b0d5..b216d750d562d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -49,6 +49,9 @@ , pulseSupport ? stdenv.isLinux , libpulseaudio +# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) +, libGL + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) , libvaSupport ? stdenv.isLinux , libva @@ -66,7 +69,7 @@ let deps = [ alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat - fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 + fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libxshmfence libXtst libuuid mesa nspr nss pango pipewire udev wayland @@ -87,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.38.109"; + version = "1.38.111"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI="; + sha256 = "sha256-sUTQktCQOVyXbw58u9ilFZaKg6D24Okpa+rUIO56ors="; }; dontConfigure = true; @@ -128,9 +131,9 @@ stdenv.mkDerivation rec { ln -sf $BINARYWRAPPER $out/bin/brave for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe done # Fix paths @@ -170,10 +173,10 @@ stdenv.mkDerivation rec { ${optionalString (disableFeatures != []) '' --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" ''} - --add-flags ${escapeShellArg commandLineArgs} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" ${optionalString vulkanSupport '' --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" + --add-flags ${escapeShellArg commandLineArgs} ''} ) ''; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bb994f7008f4b..02292a8c61e51 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "101.0.4951.41", - "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609", - "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq", + "version": "101.0.4951.54", + "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62", + "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y", "deps": { "gn": { "version": "2022-03-14", @@ -12,16 +12,16 @@ } }, "chromedriver": { - "version": "101.0.4951.15", - "sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24", - "sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b", - "sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9" + "version": "101.0.4951.41", + "sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr", + "sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl", + "sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y" } }, "beta": { - "version": "102.0.5005.27", - "sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m", - "sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx", + "version": "102.0.5005.40", + "sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb", + "sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642", "deps": { "gn": { "version": "2022-04-14", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "103.0.5028.0", - "sha256": "06i6kgsdril5gfbjl1sh0z5hqvq64bchhb2z8w0h8cw9977bvqk6", - "sha256bin64": "09hxvcv5n1kd4qnwh6pxzmrlnc8xijm7rwb1c8c57v0jjb32x9ry", + "version": "103.0.5042.0", + "sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h", + "sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh", "deps": { "gn": { - "version": "2022-04-26", + "version": "2022-05-02", "url": "https://gn.googlesource.com/gn", - "rev": "ced9fbfe6943854e65ada4ac1849d1fa4cb19348", - "sha256": "14fgjsfqihmma1cr8n30n37vxkf20paa6swq2yxn1agjvfr9cdvl" + "rev": "53ef169800760fdc09f0773bf380fe99eaeab339", + "sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r" } } }, diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index f46736d0672aa..8f36d68e7f2fe 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "100.0-1", + "packageVersion": "100.0-2", "source": { - "rev": "100.0-1", - "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla" + "rev": "100.0-2", + "sha256": "0pr7fb91zw5qlnfvaavzksd3c2xzgn1344mmfnz9yx2g42vcyi7d" }, "firefox": { "version": "100.0", diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 6598ba27a872c..4acdd563d66f7 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "99.0.1150.16"; + version = "101.0.1210.19"; revision = "1"; - sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h"; + sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p"; }; dev = import ./browser.nix { channel = "dev"; - version = "100.0.1163.1"; + version = "102.0.1227.0"; revision = "1"; - sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq"; + sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x"; }; stable = import ./browser.nix { channel = "stable"; - version = "98.0.1108.56"; + version = "100.0.1185.44"; revision = "1"; - sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7"; + sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89"; }; } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56c7083fee69a..9293cc3050d8a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.10"; + version = "11.0.11"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp"; + sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3"; + sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5"; }; }; in @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\$DISPLAY" \ + DISPLAY="\''${DISPLAY:-}" \ DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ @@ -366,10 +366,10 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ - MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \ - WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \ - XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \ - XCURSOR_PATH="\$XCURSOR_PATH" \ + MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ + WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ + XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ + XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ \ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ @@ -409,9 +409,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \ - XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \ - DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + TBB_HOME=$(mktemp -d) \ $out/bin/tor-browser --version >/dev/null ''; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index beedc41fa8ec3..069307c41e910 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ris ]; + mainProgram = "bosh"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 3889082ec0c94..21e2f00c3e2f8 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -66,5 +66,6 @@ in buildGoModule rec { homepage = "https://fluxcd.io"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index f0a9912ab914e..16e9203bf9c3d 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ivankovnatsky ]; + mainProgram = "kubectl-relay"; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d4a9ba4af7d30..3ee00d4121a90 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,6 +7,7 @@ , which , libvirt , vmnet +, makeWrapper }: buildGoModule rec { @@ -24,7 +25,7 @@ buildGoModule rec { sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; - nativeBuildInputs = [ installShellFiles pkg-config which ]; + nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; @@ -35,9 +36,8 @@ buildGoModule rec { installPhase = '' install out/minikube -Dt $out/bin + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false export HOME=$PWD - export MINIKUBE_WANTUPDATENOTIFICATION=false - export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index bab73c41f5f59..89bbd0cb7d6df 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -60,9 +60,10 @@ buildGoModule rec { meta = with lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; - license = licenses.asl20; homepage = "http://www.openshift.org"; + license = licenses.asl20; maintainers = with maintainers; [ offline bachp moretea stehessel ]; + mainProgram = "oc"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 73f618cb0294f..b4191bbd78c80 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -63,11 +63,10 @@ let kalbasit marsam maxeaubrey + techknowlogick timstott - zimbatm zowoq - techknowlogick - ]; + ] ++ teams.numtide.members; }; } // attrs'); diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8421a077d0058..d74378378b968 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.8"; + version = "3.3.9"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; - rev = "v${version}"; - hash = "sha256-ZGs5ixNcrkoZ4TRVuIUeNF1FNJwKpYElNv6oPhGiEmU="; + rev = "refs/tags/v${version}"; + hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index eae63701d4d98..94ad490aeadda 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon , mesa, openssl, systemd, xorg }: stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.42.0"; + version = "8.43.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-O440sk6OJUsO+5TuzLxkUELnCfxKd5byoxSD+Rs4h1c="; + sha256 = "sha256-Rm1U3gxrToNCigL5AomftSUED7X3i7a6enmFnEzWV4c="; }; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook + wrapGAppsHook ]; buildInputs = [ @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { freetype glib gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base libGL libinput @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 4be9e03931b26..04e0e91ddc280 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.55.2"; + version = "2.55.4"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4="; + sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA="; + sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 4c28e346a124c..ffe82e6708aad 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; }; + patches = [ + # Pull pending patch for -fno-common tuulchain support: + # https://github.com/GNUFreetalk/freetalk/pull/39 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; + sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; + }) + ]; + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3b11f7fc1a89a..306a53f0a3c0e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,51 +1,18 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , fetchFromGitLab -, fetchurl -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , lib -, libexosip , liblinphone -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 -, libxml2 -, makeWrapper -, mbedtls , mediastreamer , mediastreamer-openh264 , minizip2 , mkDerivation -, openldap -, ortp -, pango -, pkg-config -, qtbase , qtgraphicaleffects , qtquickcontrols2 , qttranslations -, readline -, speex -, sqlite - -, udev -, zlib }: # How to update Linphone? (The Qt desktop app) @@ -95,57 +62,22 @@ mkDerivation rec { # linphone-desktop. buildInputs = [ # Made by BC - bcg729 bctoolbox belcard belle-sip belr - bzrtp liblinphone mediastreamer mediastreamer-openh264 - ortp - - # Vendored by BC but we use upstream, might cause problems - libmatroska - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp - libxml2 - mbedtls minizip2 - openldap - pango - qtbase qtgraphicaleffects qtquickcontrols2 qttranslations - readline - speex - sqlite - udev - zlib ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake - graphviz - intltool - makeWrapper - pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index aeb20d6779ef5..fe3f90346f1cc 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1615"; + version = "1.5.1618"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI="; + sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c96fb1b58a969..6afccfaaa0702 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.39.0"; # Please backport all updates to the stable channel. + version = "5.42.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-Dy5orMKZvvnHZu/2U5YIJdDR4eDM3SBjXVGHuBv0kgc="; + sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c848cb55c0d71..f81b8853c8b26 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220425"; + version = "20220430"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-FWW4rVaoShT55ZWN/siFHoTTNcarnfTa2h/J2GWxLW8="; + sha256 = "sha256-clG0B7PgtlpsSnZgglkv7y7SOtMTBvwJMnvMrcTWXdI="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 0fc0284a183e5..0d5f6bfbfa813 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2021-12-14"; + version = "unstable-2022-04-29"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "8091752a67781273944e7a79a803b7a671378313"; - sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I="; + rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5"; + sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg="; }; - vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A="; + vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a900a469e0315..2dc167012221e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -18,7 +18,7 @@ let scriptPython = python.withPackages (ps: with ps; [ aiohttp requests - python_magic + python-magic ]); version = "0.3.0"; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index 987271e4ffa29..fd5f376ad2636 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -24,6 +24,9 @@ let buildInputs = [ gmp ]; + # Tests are relying on old Python 2 modules. + doCheck = false; + preConfigure = '' sed -i 's,/usr/include,/no-such-dir,' configure sed -i "s!,'/usr/include/'!!" setup.py @@ -66,5 +69,9 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; description = "WeeChat script for Off-the-Record messaging"; + knownVulnerabilities = [ + "There is no upstream release since 2018-03." + "Utilizes deprecated and vulnerable pycrypto library with Debian patches from 2020-04." + ]; }; } diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cb49829dce073..d8a4d1066ecb2 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec { file gpgme notmuch2 - python_magic + python-magic service-identity twisted urwid diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 43cd7183c5110..2bcfd839e2854 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20220415"; + version = "20220429"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-iVKDgVN7YFPEMP+OISS7jRG9Whs2QG60yH1r2kw3MUQ="; + sha256 = "sha256-LBY7WtmEMg/PcMS/Tc5XEYunIWjoI4IQfUJURKgy1YA="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index e5edfaa467090..92a8563633c2e 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.91.10"; + version = "3.95.4"; src = fetchurl { - url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; + sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 72b4c7720480d..84ac952846f3c 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,9 +1,8 @@ -{ pkgs, nodejs-14_x, stdenv, lib }: +{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { inherit pkgs; - nodejs = nodejs-14_x; inherit (stdenv.hostPlatform) system; }; in @@ -12,7 +11,17 @@ nodePackages.n8n.override { node-pre-gyp ]; - passthru.updateScript = ./generate-dependencies.sh; + dontNpmInstall = true; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n + ''; + + passthru = { + updateScript = ./generate-dependencies.sh; + tests = nixosTests.n8n; + }; meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh index f7412bc5e5e26..7c1b90a040343 100755 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -13,7 +13,7 @@ cd "$(dirname $(readlink -f $0))" node2nix \ - --14 \ + --nodejs-16 \ --strip-optional-dependencies \ --node-env node-env.nix \ --input package.json \ diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index 53bdef1f98646..ca76a98f5a657 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index 5f055785791ba..2590dd267a4ef 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -98,7 +98,7 @@ let '' + (lib.concatMapStrings (dependency: '' - if [ ! -e "${dependency.name}" ]; then + if [ ! -e "${dependency.packageName}" ]; then ${composePackage dependency} fi '' @@ -257,8 +257,8 @@ let var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -390,7 +390,7 @@ let buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -409,7 +409,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -441,6 +441,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -471,7 +479,7 @@ let buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -489,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -519,6 +527,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -541,7 +550,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -557,9 +566,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -578,7 +588,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index c0a2b9a5fd983..0b6f39726a7fc 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@azure/abort-controller-1.0.5" = { + "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.5.tgz"; - sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg=="; + url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz"; + sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; }; }; "@azure/core-asynciterator-polyfill-1.0.2" = { @@ -31,13 +31,13 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; - "@azure/core-http-2.2.4" = { + "@azure/core-http-2.2.5" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; - sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz"; + sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ=="; }; }; "@azure/core-lro-2.2.4" = { @@ -976,13 +976,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1125.0" = { + "aws-sdk-2.1129.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1125.0"; + version = "2.1129.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1125.0.tgz"; - sha512 = "2syNkKDqDcDmB/chc61a5xx+KYzaarLs1/KshE0b1Opp2oSq2FARyUBbk59HgwKaDUB61uPF33ZG9sHiIVx2hQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz"; + sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg=="; }; }; "aws-sign2-0.7.0" = { @@ -1858,13 +1858,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.22.3" = { + "core-js-3.22.4" = { name = "core-js"; packageName = "core-js"; - version = "3.22.3"; + version = "3.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.3.tgz"; - sha512 = "1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz"; + sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w=="; }; }; "core-util-is-1.0.2" = { @@ -2641,13 +2641,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; }; "for-each-0.3.3" = { @@ -4522,13 +4522,13 @@ let sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw=="; }; }; - "n8n-editor-ui-0.142.0" = { + "n8n-editor-ui-0.142.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.142.0"; + version = "0.142.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.0.tgz"; - sha512 = "aDXm64Y+tcLicd0z9pIxhSfqCb/JjsMIAOJ7DB35HKg7riOE7TGBHkWQ6F61XEjusJLl6ZGr15V+9EoCTu+02g=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz"; + sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw=="; }; }; "n8n-nodes-base-0.173.0" = { @@ -4567,13 +4567,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.3.3" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz"; - sha512 = "p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "native-duplexpair-1.0.0" = { @@ -4693,13 +4693,13 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.4" = { + "nodemailer-6.7.5" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.4"; + version = "6.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.4.tgz"; - sha512 = "TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz"; + sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg=="; }; }; "nopt-5.0.0" = { @@ -6367,13 +6367,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.6" = { + "sqlite3-5.0.7" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.6.tgz"; - sha512 = "uT1dC6N3ReF+jchY01zvl1wVFFJ5xO86wSnCpK39uA/zmAHBDm6TiAq1v876QKv8JgiijxQ7/fb5C2LPm7ZAJA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz"; + sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg=="; }; }; "sqlstring-2.3.3" = { @@ -6493,22 +6493,22 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; }; }; - "string.prototype.trimstart-1.0.4" = { + "string.prototype.trimstart-1.0.5" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; }; }; "string_decoder-0.10.31" = { @@ -7534,13 +7534,13 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.175.0"; + version = "0.175.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.175.0.tgz"; - sha512 = "FKIroWsEZNZ/HUdM6iQ8QY6WxYs4uQufodBoKpbcu6JJKF/ufYO4U8lpIM0nV2YCMaB+JAVvswim0SUDB6KF3A=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz"; + sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA=="; }; dependencies = [ - (sources."@azure/abort-controller-1.0.5" // { + (sources."@azure/abort-controller-1.1.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -7551,7 +7551,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-http-2.2.4" // { + (sources."@azure/core-http-2.2.5" // { dependencies = [ sources."tough-cookie-4.0.0" sources."tslib-2.4.0" @@ -7725,7 +7725,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1125.0" // { + (sources."aws-sdk-2.1129.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7902,7 +7902,7 @@ in sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.3" + sources."core-js-3.22.4" sources."core-util-is-1.0.2" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -8012,7 +8012,7 @@ in }) sources."flatted-3.2.5" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-4.0.0" @@ -8282,7 +8282,7 @@ in sources."mz-2.7.0" sources."n8n-core-0.116.0" sources."n8n-design-system-0.19.0" - sources."n8n-editor-ui-0.142.0" + sources."n8n-editor-ui-0.142.1" (sources."n8n-nodes-base-0.173.0" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -8296,7 +8296,7 @@ in ]; }) sources."nanoclone-0.2.1" - sources."nanoid-3.3.3" + sources."nanoid-3.3.4" sources."native-duplexpair-1.0.0" (sources."nearley-2.20.1" // { dependencies = [ @@ -8317,7 +8317,7 @@ in sources."node-html-parser-5.3.3" sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.4" + sources."nodemailer-6.7.5" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -8577,7 +8577,7 @@ in ]; }) sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.6" + sources."sqlite3-5.0.7" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" @@ -8591,8 +8591,8 @@ in sources."stream-shift-1.0.1" sources."string-similarity-4.0.4" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strtok3-6.3.0" diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index f4e4c8279de84..4d62cc4c828e2 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.9"; + version = "1.13.8"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q"; + sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 2c07d637bd41f..32dadb8e5f926 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -6,6 +6,7 @@ , inotify-tools , installShellFiles , libcloudproviders +, librsvg , libsecret , openssl , pcre @@ -20,7 +21,6 @@ , plasma5Packages , sphinx , sqlite -, inkscape , xdg-utils }: @@ -50,18 +50,15 @@ mkDerivation rec { done ''; - # required to not include inkscape in the wrapper - strictDeps = true; - nativeBuildInputs = [ pkg-config cmake - inkscape + extra-cmake-modules + librsvg sphinx ]; buildInputs = [ - extra-cmake-modules inotify-tools libcloudproviders libsecret diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index da7633221a5a1..a0e2388d16cc7 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip +, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { pname = "transgui"; - version = "5.18.0"; + version = "unstable-2022-02-02"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "v${version}"; - sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; + rev = "0e2c2a07c1b21b1704c0a4945a111a8aa1050a1a"; + sha256 = "1x9wzii3q9zanpik4xc99jqsfrqch8vjmlx12jrvczxcfy51b1ba"; }; + patches = [ + # TDDO: remove when transgui updates for transmission-daemon v3 rpc protocol + (fetchpatch { + url = "https://github.com/transmission-remote-gui/transgui/commit/9275c3fb877dd753a1940d1b900630cdc09a0cc2.patch"; + sha256 = "0w2x7gcxp5kqczdz7ckfqhdz9hhkm62k8gcws54d6km7x9vc1023"; + }) + ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - fpc lazarus stdenv.cc - libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl + fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf + pango atk cairo openssl ]; - NIX_LDFLAGS = " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 - -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto - "; + NIX_LDFLAGS = '' + -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 + -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo + -lc -lcrypto + ''; - prePatch = '' + postPatch = '' substituteInPlace restranslator.pas --replace /usr/ $out/ ''; @@ -33,23 +41,19 @@ stdenv.mkDerivation rec { lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus ''; - makeFlags = [ - "FPC=fpc" - "PP=fpc" - "INSTALL_PREFIX=$(out)" - ]; + makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ]; LCL_PLATFORM = "gtk2"; - desktopItem = makeDesktopItem rec { - name = "transgui"; - exec = name + " %U"; - icon = name; + desktopItem = makeDesktopItem { + name = pname; + exec = "${pname} %U"; + icon = pname; type = "Application"; comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + categories = [ "Network" "FileTransfer" "P2P" "GTK" ]; startupNotify = true; mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; @@ -64,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A cross platform front-end for the Transmission Bit-Torrent client"; + description = "A cross platform front-end for the Transmission BitTorrent client"; homepage = "https://sourceforge.net/p/transgui"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg ]; - platforms = lib.platforms.linux; + mainProgram = "transgui"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix new file mode 100644 index 0000000000000..c3e9bd2ac2159 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-cli/2.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pythonOlder +, requests +, docopt +, pythondialog +, jinja2 +, distro +, dialog +, iptables +, openvpn }: + +buildPythonApplication rec { + pname = "protonvpn-cli_2"; + version = "2.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Rafficer"; + repo = "linux-cli-community"; + # There is a tag and branch with the same name + rev = "refs/tags/v${version}"; + sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; + }; + + propagatedBuildInputs = [ + requests + docopt + pythondialog + jinja2 + distro + dialog + openvpn + iptables + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Linux command-line client for ProtonVPN using Openvpn"; + homepage = "https://github.com/Rafficer/linux-cli-community"; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "protonvpn"; + }; +} diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e46909d2a7c32..5182b5c256f37 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -1,37 +1,41 @@ -{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: +{ lib +, buildPythonApplication +, pythonOlder +, fetchFromGitHub +, protonvpn-nm-lib +, pythondialog +, dialog +}: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-cli"; - version = "2.2.6"; +buildPythonApplication rec { + pname = "protonvpn-cli"; + version = "3.11.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = "v${version}"; - sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; + rev = version; + sha256 = "sha256-u+POtUz7NoGS23aOmvDCZPUp2HW1xXGtfbZR88cWCBc="; }; - propagatedBuildInputs = (with python3Packages; [ - requests - docopt - setuptools - jinja2 - pythondialog - ]) ++ [ - dialog - openvpn - iptables - ]; + propagatedBuildInputs = [ + protonvpn-nm-lib + pythondialog + dialog + ]; - # No tests + # Project has a dummy test doCheck = false; meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "protonvpn"; + mainProgram = "protonvpn-cli"; }; } diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 68af0bd2890a3..a76be3d318c3c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.16"; + version = "2.4.17"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; + hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e4088c3c460e8..9c50cb28ec13f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -45,6 +45,7 @@ let changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + mainProgram = target; platforms = platforms.unix; }; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 5ebde5e10dece..a67c9c2a70afa 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -90,6 +90,9 @@ in (mkDrv rec { url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch"; sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls="; }) + + # Fix build with poppler 22.04 + ./poppler-22-04-0.patch ]; ### QT/KDE diff --git a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch new file mode 100644 index 0000000000000..c907bf1680b4f --- /dev/null +++ b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch @@ -0,0 +1,100 @@ +Patch from OpenSUSE +https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 +Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +=================================================================== +--- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew + { + // TODO(P3): Unfortunately, need to read stream twice, since + // we must write byte count to stdout before ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); ++ if ( pBuf ) ++ { ++ aNewFont.isEmbedded = true; ++ nSize = pBuf->size(); ++ } ++#else + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + if( pBuf ) + { + aNewFont.isEmbedded = true; + gfree(pBuf); + } ++#endif + } + + m_aFontMap[ nNewId ] = aNewFont; +@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* + return; + + int nSize = 0; ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); ++ if ( !pBuf ) ++ return; ++ nSize = pBuf->size(); ++#else + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + if( !pBuf ) + return; ++#endif + + // ---sync point--- see SYNC STREAMS above + fflush(stdout); + ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) ++ { ++#else + if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) + { + gfree(pBuf); ++#endif + exit(1); // error + } + // ---sync point--- see SYNC STREAMS above + fflush(g_binary_out); ++#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed + gfree(pBuf); ++#endif + } + + #if POPPLER_CHECK_VERSION(0, 83, 0) +@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta + { + assert(state); + ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ std::shared_ptr<GfxFont> gfxFont = state->getFont(); ++#else + GfxFont *gfxFont = state->getFont(); ++#endif + if( !gfxFont ) + return; + +@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta + m_aFontMap.find( fontID ); + if( it == m_aFontMap.end() ) + { ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ nEmbedSize = parseFont( fontID, gfxFont.get(), state ); ++#else + nEmbedSize = parseFont( fontID, gfxFont, state ); ++#endif + it = m_aFontMap.find( fontID ); + } + +@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta + + if (nEmbedSize) + { ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ writeFontFile(gfxFont.get()); ++#else + writeFontFile(gfxFont); ++#endif + } + } + diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ec83da852aba4..dce6869f36e42 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { python-dotenv python-gnupg python-Levenshtein - python_magic + python-magic pytz pyyaml redis diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 5e1545109409a..653e72a163eb3 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.57.1"; + version = "0.57.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-uEEFkHyApf+TObcu+Yo5vBOs2Erq0IXGhbjzlEe8NmI="; + sha256 = "sha256-ftLKlNzr46iL/V+P3J1wtoUByGHHl7wrh4xctU4JYkM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 8617d62335602..3fd9c3410693a 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.4.1"; + version = "22.5.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da"; + sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 754c9ba03d4eb..d3f706bbf0549 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -84,6 +84,11 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; }) + # For Poppler 22.04 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; + sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 477ae48b5f4bf..aa591c225ad06 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -7,35 +7,30 @@ }: let - version = "3.9.1"; + version = "4.8.0"; pname = "timeular"; - name = "${pname}-${version}"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "103hy443p697jdkz6li8s1n6kg1r55jmiw2vbjz12kskf7njg4y4"; + sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; - - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace "Exec=AppRun --no-sandbox %U" "Exec=$out/bin/${pname}" ''; meta = with lib; { diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 0e06cf2f65a1c..fbeea83996278 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation { description = "Simple plaintext todo list manager"; homepage = "http://todotxt.com"; license = lib.licenses.gpl3; + mainProgram = "todo.sh"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 7190fe90040d2..9e2752e163f05 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.50.3"; + version = "0.51.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "sha256-0N2+NcdZGxaj4LcG5edyd3ry+0dSQSfUQRqZEYFfWqQ="; + sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "sha256-za32yRhusReoGIRdbfx30CPH63BVXz2Z7jkhxtb7XSo="; + sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig"; }; in { diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index eb5937bbc3c3b..b463faa4a255d 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor viraptor ]; + mainProgram = "kal"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 79dcab19acb42..4875a4818f8d8 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation { description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; + mainProgram = "SoapySDRUtil"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index d4727b41bd0e0..801ad00876bf5 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "bwa"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; + patches = [ + # Pull upstream patch for -fno-common toolchain support like upstream + # gcc-10: https://github.com/lh3/bwa/pull/267 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lh3/bwa/commit/2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch"; + sha256 = "1lihfxai6vcshv5vr3m7yhk833bdivkja3gld6ilwrc4z28f6wqy"; + }) + ]; + buildInputs = [ zlib ]; # Avoid hardcoding gcc to allow environments with a different diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 13876430822a5..05d7d0388f0d8 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.220"; + version = "4.222"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y0j6j8kPCONlegFoWl46LXtfoiLhzMsHCVv+kLe7UyE="; + sha256 = "sha256-AvjcStbiXDdhJnaSJJ5Mp6zscvaxhb+A2J+0gpm2rFI="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 20c33f0fbae55..4e808dd8f19e8 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "abc"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index aee1a9c63f8fe..5a48abfc4aa48 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -115,6 +115,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; + mainProgram = executable-name; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 0249752797c19..66acf07f8e4d7 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.5.0"; + version = "7.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; - rev = "v${version}"; - hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE="; + rev = "refs/tags/v${version}"; + hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index afd05c3e8f711..7a75c8edb2b36 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -68,6 +68,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132 + # remove once updated past 4.2.0 + ./fix-10132.patch + ]; + meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "http://qgroundcontrol.com/"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch new file mode 100644 index 0000000000000..0a666132f9319 --- /dev/null +++ b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch @@ -0,0 +1,62 @@ +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +index 2b314e0..ad1425e 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + + GstQSGTexture::GstQSGTexture () + { +- static volatile gsize _debug; ++ static gsize _debug; + + initializeOpenGLFunctions(); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +index 3a68576..5203d13 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +@@ -58,7 +58,7 @@ gst_qt_get_gl_display () + { + GstGLDisplay *display = NULL; + QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +index f031b36..3c6722a 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +@@ -106,7 +106,7 @@ void InitializeSceneGraph::run() + + QtGLVideoItem::QtGLVideoItem() + { +- static volatile gsize _debug; ++ static gsize _debug; + + if (g_once_init_enter (&_debug)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +index 8bf14ae..2f88aa9 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : + QQuickWindow( parent ), source (src) + { + QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering() + + g_mutex_lock (&this->priv->lock); + +- static volatile gsize once = 0; ++ static gsize once = 0; + if (g_once_init_enter(&once)) { + this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); + g_once_init_leave(&once,1); + diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1e234dea5e3e6..3d0c7a9cd3091 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation rec { pname = "fnc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; }; + patches = [ + (fetchpatch { + name = "sqlite3-upgrade.patch"; + url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d"; + sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s="; + }) + ]; + patchFlags = [ "-p0" ]; + buildInputs = [ libiconv ncurses zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 6b6da70bb942d..4f774f5b2f4a2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,5 +1,7 @@ { lib , buildPythonApplication +, pytest-mock +, pytestCheckHook , fetchFromGitHub , installShellFiles , git @@ -21,7 +23,7 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git ]; + checkInputs = [ git pytest-mock pytestCheckHook ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 87d92e72a8fec..d5791f6506cdf 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.12"; + version = "0.3.0"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe"; + sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44"; + sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4585eda494742..cc8cd00b7d14e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.10.1", - "repo_hash": "13868wb0zr862xaxapp8nxh16gjsawklw66rlxx95bhhm3r81nrp", + "version": "14.10.2", + "repo_hash": "0f7cfc1wrzz4m5yhd6jnp3dqpdy7vbj8bf826zjsi2ss48430bk0", "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.10.1-ee", + "rev": "v14.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.10.1", + "GITALY_SERVER_VERSION": "14.10.2", "GITLAB_PAGES_VERSION": "1.56.1", "GITLAB_SHELL_VERSION": "13.25.1", - "GITLAB_WORKHORSE_VERSION": "14.10.1" + "GITLAB_WORKHORSE_VERSION": "14.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 3126ce718e854..127a4ec461fc4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.10.1"; + version = "14.10.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-4TbCfe41Nea1p0aDqGbF4SskUl5r9LRHKA16DH97jMI="; + sha256 = "sha256-hLTzkW5GDq1AgTwe1pVj6Tiyd0JpJ76ATFu3Q+m9MVg="; }; vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 602d8650f3376..2613fe85f81bd 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.10.1"; + version = "14.10.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 9e444fb3b39e0..f38bb042c435f 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libuuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libmd, zlib, ncurses }: stdenv.mkDerivation rec { pname = "got"; - version = "0.68.1"; + version = "0.69"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "122wignzrhsw00mfnh7mxcxvjyp9rk73yxzfyvmg7f5kmb0hng35"; + sha256 = "1cnl0yk866wzjwgas587kvb08njq7db71b5xqsdrwd1varp010vm"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libmd zlib ncurses ]; + buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]; doInstallCheck = true; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 462744641e3b1..f8f58cdcaba29 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -36,6 +36,13 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; }) + + # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; + sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 476df99d2324e..2e0e01e5c9862 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,12 +1,38 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }: +{ stdenv +, fetchurl +, lib +, qtbase +, qtwebengine +, qtdeclarative +, qtwebchannel +, syntax-highlighting +, openssl +, xkeyboard_config +, patchelfUnstable +, wrapQtAppsHook +, writeText +}: +let + # This abomination exists because p4v calls CRYPTO_set_mem_functions and + # expects it to succeed. The function will fail if CRYPTO_malloc has already + # been called, which happens at init time via qtwebengine -> ... -> libssh. I + # suspect it was meant to work with a version of Qt where openssl is + # statically linked or some other library is used. + crypto-hack = writeText "crypto-hack.c" '' + #include <stddef.h> + int CRYPTO_set_mem_functions( + void *(*m)(size_t, const char *, int), + void *(*r)(void *, size_t, const char *, int), + void (*f)(void *, const char *, int)) { return 1; } + ''; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "p4v"; - version = "2020.1.1966006"; + version = "2021.3.2186916"; src = fetchurl { - url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz"; - sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10"; + url = "http://web.archive.org/web/20211118024745/https://cdist2.perforce.com/perforce/r21.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "1zldg21xq4srww9pcfbv3p8320ghjnh333pz5r70z1gwbq4vf3jq"; }; dontBuild = true; @@ -15,11 +41,10 @@ stdenv.mkDerivation rec { ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc.lib qtbase - qtmultimedia - qtscript - qtsensors qtwebengine - qtwebkit + qtdeclarative + qtwebchannel + syntax-highlighting openssl ]; @@ -29,14 +54,17 @@ stdenv.mkDerivation rec { cp -r bin $out mkdir -p $out/lib cp -r lib/P4VResources $out/lib + $CC -fPIC -shared -o $out/lib/libcrypto-hack.so ${crypto-hack} for f in $out/bin/*.bin ; do patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f # combining this with above breaks rpath (patchelf bug?) - patchelf --add-needed libstdc++.so $f \ + patchelf --add-needed libstdc++.so \ + --add-needed $out/lib/libcrypto-hack.so \ --clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \ --clear-symbol-version _ZTVSt20bad_array_new_length \ --clear-symbol-version _ZTISt20bad_array_new_length \ + --clear-symbol-version _ZdlPvm \ $f wrapQtApp $f \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 9331471c747e6..7f705bc3526df 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.9"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RBrCIDinPXbXKqrrhqVf3rV4rfi+2PttIaYxUKOk7hs="; + sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 7698e6619d91c..1319f72f4e975 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.8+matrix.1"; + version = "0.5.10+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; + sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index d21d78c42b2a2..20c49692b8d3d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,21 +10,21 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.2.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-gstreamer"; rev = "v${version}"; - sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; + hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg="; }; nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ gst_all_1.gstreamermm obs-studio ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; - homepage = "https://github.com/fswoch/obs-gstreamer"; + homepage = "https://github.com/fzwoch/obs-gstreamer"; maintainers = with maintainers; [ ahuzik ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index fc264cdc59083..1b58b4ee9cf6a 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-6yc+7Fc22b8xN8thRrxxpjdEz19aBYCWxgkh/nra784="; + sha256 = "sha256-gb2XFIzYU1dZh8WPheb4073AOLdfT7CbBD89HxobY9Y="; }; - vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ="; + vendorSha256 = "sha256-2pWBMXVnmKE4D7JXaKOqtuCz7nsX2a/58lyLp58OTYI="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ef9050f47d969..125061bedaf2c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -186,7 +186,7 @@ rec { export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 - go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker + go build -tags pkcs11 --ldflags "$GO_LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.14"; + version = "20.10.15"; rev = "v${version}"; - sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; + sha256 = "sha256-uzwnXDomho5/Px4Ou/zP8Vedo2J9hVfcaFzM9vWh2Mo="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-I5oxpFLH789I2Sb29OXDaM4fCbQT/KvPq0DYcAVp0aI="; + sha256 = "sha256-+Eds5WI+Ujz/VxkWb1ToaGLk7wROTwWwJYpiZRIxAf0"; }; - runcRev = "v1.0.3"; - runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; - containerdRev = "v1.5.11"; - containerdSha256 = "sha256-YzFtv6DIjImSK0SywxhZrEeEmCnHTceAi3pfwnPubKg="; + runcRev = "v1.1.1"; + runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; + containerdRev = "v1.6.4"; + containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index 9169aea4f51a6..eaafac71b6c18 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation { pname = "wmfs"; @@ -12,6 +12,17 @@ stdenv.mkDerivation { rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; }; + patches = [ + # Pull patch pending upstream inclusion to fix build on + # -fno-common toolchain like upstream gcc-10: + # https://github.com/xorg62/wmfs/pull/104 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch"; + sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2"; + }) + ]; + buildInputs = [ imlib2 libX11 diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index eea1e3baeecaf..e122871f8f5a7 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -346,6 +346,9 @@ crate_: lib.makeOverridable outputs = if buildTests then [ "out" ] else [ "out" "lib" ]; outputDev = if buildTests then [ "out" ] else [ "lib" ]; + meta = { + mainProgram = crateName; + }; } // extraDerivationAttrs ) ) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 859dae4e49cbe..fbf16d16fd66b 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "15.2.0"; + version = "15.3.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 3e9e69ae9dfce..181aa44e01880 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv"; - iosevka-aile = "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq"; - iosevka-curly = "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq"; - iosevka-curly-slab = "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq"; - iosevka-etoile = "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08"; - iosevka-slab = "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb"; - iosevka-ss01 = "1k451iv9fvp86arw0z685xyixlkpnsg3mxl6k9s47xxf9r82ab2a"; - iosevka-ss02 = "066l1jamvlnksl1jn4l5qqll4wi19w0jr9x7bw0lpdic9478cs8g"; - iosevka-ss03 = "0qh5ds9s7rghmar90ymxvcninmcm2hc05f83ixjadjfg9a27sff7"; - iosevka-ss04 = "1zl2m68wqync8n93n06yj49r6n652yakrvdcsdvqm3agajnz0wnk"; - iosevka-ss05 = "0rxakr04kwrwjfq7a6y2vdyjfgn162d8353pn7nc9wsfyrjbqpc2"; - iosevka-ss06 = "0lfv6cvqy1mcn7zds7c6w68ky4y3clmvxcrg5knilm7sfql1jis1"; - iosevka-ss07 = "1cc15rnnq2vzp22p8ld94jl2lyn6k8bra5792yqvyg23lf493jk2"; - iosevka-ss08 = "0ysrq40kpvgfiapk1x9nzvvd81r0kyl1jlywwhmm3f4qca86a3ja"; - iosevka-ss09 = "1535y8gmlkd1nqywcbmp7x9y9ahmskmwgs138baaj642jbq85l1b"; - iosevka-ss10 = "01z7nwyqqda6jw819ajr9cd691yxd0b3irj4amdwnl6b46a278q7"; - iosevka-ss11 = "0zi2n6h7jqf4vbg6r5vjzk0y8fj1lfjifsa1s3j0dmgs05m2bzc8"; - iosevka-ss12 = "1h5bw4fp6kgszzwd9dpi461yf3mnkm0b5cgpaliyl2qpd8jivmm1"; - iosevka-ss13 = "06v5angxqnbz9a53358ls0w78ib1d57g3svnfyplw7ynd0rrvw93"; - iosevka-ss14 = "0ic0hh6xh1pl1jzkmp1ddbzhvfzislimlgwsdcnimzxk6ga5k44j"; - iosevka-ss15 = "1mg363g47j90z00dpha81jk0n2ck59ca172g165m7cmz1bb425iq"; - iosevka-ss16 = "0bs3rhwgnv9cwzgmsgzgjgv6awz5igxcvq64xpycw0dp17wbfl1z"; - iosevka-ss17 = "0ssi56j8jdkhpsq7acczy3z9v8q3amr6a6jxv49rd4473fxzh3zc"; - iosevka-ss18 = "13s77f1ki09szpa64qb00421kj2n5q2lv0vb2ahnlvphsbgik1j6"; - sgr-iosevka = "0pqhpm13q23f82lkcimk8pinm41j6xmdlqxmfzg1y7m50gzdm10r"; - sgr-iosevka-aile = "1malyfkc9dd552p04vq2b2nlv613pjzw84q8gnlpy8bycgx5np3s"; - sgr-iosevka-curly = "0b8gnk8hsily9wp91hi66xjyj5hwqcab7j64x1xzzdc7fnfaz0qq"; - sgr-iosevka-curly-slab = "0i9k38a7fb9z6jwds92kz3pgf1ryjz1m12ad1mslwq82kwy00h3f"; - sgr-iosevka-etoile = "0rw4dhivxf3yls28zs34xia56dzx1w2as2j619ji36dpmh1v3ljn"; - sgr-iosevka-fixed = "1zcr7zcpca5bhgaisjjlbn7zn1ih6mz6k4nj27y4ya8hnasfqxlh"; - sgr-iosevka-fixed-curly = "17jvx2rvfqx6ip8h8srr6iwy55nnwvkrrflr4hxdyv8ggi8d8y7d"; - sgr-iosevka-fixed-curly-slab = "01s3wz0r2wmybws96s1mcplx7zrbciqabsgaa5jy4kwn8rg0ajpi"; - sgr-iosevka-fixed-slab = "1xbsrywi413r6gkmwc11yw8pkrc6hkf5309dfr25qwnn6c8wvqiy"; - sgr-iosevka-fixed-ss01 = "17776y4lv7vyqhcanmayvksh85v0907vys4f3hpxjbw86497f4zj"; - sgr-iosevka-fixed-ss02 = "0cwz8bfj05vr2800r35nd8d7r05hr4fd2wbx26dga3qnddawcgbp"; - sgr-iosevka-fixed-ss03 = "1df1aigpy5g46g68l9fln2af4fafl9fs197nz49biw66ndraym4c"; - sgr-iosevka-fixed-ss04 = "02g22kfd4nw8cvfkcjw9mixvw2abfzpbalcwcqidyn8qd3s51x1v"; - sgr-iosevka-fixed-ss05 = "12zwmzh0ilclkpw18lqkp4dpawngwf21ah90ywi3spzl9whqk5wc"; - sgr-iosevka-fixed-ss06 = "01ajn8gwqljx8da9fv9dlawwafcnqvf9pld9h8lygrg67kf3p1j6"; - sgr-iosevka-fixed-ss07 = "000sk29gfp9z7690880kixmk08swnwpp8zs89idgpg5qhs5479qm"; - sgr-iosevka-fixed-ss08 = "1fcw4wmz12ar5hy3r5hmagwss46yjsckk4hxhjfphbapznmyw2dx"; - sgr-iosevka-fixed-ss09 = "0jxpf854njzjw7r1q1jaizbfhaal7idhs9v5l64c03q40s2cycxr"; - sgr-iosevka-fixed-ss10 = "0n40gl7ygcc03n6673rkjdfqshd6fx7f0a831fz007s61c38rdl9"; - sgr-iosevka-fixed-ss11 = "0r0wlmpa5nmgwx92f6x2jimgyh5x05id39wsmxpyhjfrl4dchkgm"; - sgr-iosevka-fixed-ss12 = "02dvkr2vim8zyd1gngjk41bbg5ncjr6yfxigy5l9gjm64x6q2szz"; - sgr-iosevka-fixed-ss13 = "14vz894yxw5252krpwh9981hmslwmyxdgp96kpq37lp35w7bhkc0"; - sgr-iosevka-fixed-ss14 = "0jaz1g89dj27s3xgcginxx4s3kr7114x7wqqda96jyc1zrg79am4"; - sgr-iosevka-fixed-ss15 = "1h12kcik341vp3yra8izcbj3490payjqy8b0y739s4bj6zmx7zb3"; - sgr-iosevka-fixed-ss16 = "0yiyxbi1snd33ys8ip29xprwm0876j818g3fr2g6d955lp94crkp"; - sgr-iosevka-fixed-ss17 = "1sv4zf5w7amhd591cjky7z2fc90hiiwj1g987scwcbvc0fb5gj86"; - sgr-iosevka-fixed-ss18 = "09yh76152ar2lkw1gavd9x5i6a6vswhw9qyic0zixzr2rmcm2j35"; - sgr-iosevka-slab = "0xdljj5bh4jsbwjgicpbi91hkjqvzxis9asd4g0vy3qqdr393i9k"; - sgr-iosevka-ss01 = "0fllywsy23d6nfvgpb98af76cwbq8pizjvcah0p8j4qql6353d5y"; - sgr-iosevka-ss02 = "0mlp4l3bbm2rm9gjb4pa8k730x3yb85qck7a1n5wdfz881mz6z59"; - sgr-iosevka-ss03 = "0kcimy2i28a82s74987f6dxkdxzr06fzsi6rb7wz5v4rn5v7vmm9"; - sgr-iosevka-ss04 = "0ynrq7di10349lfqm34vzr6z9z5hx6lz4q2z73ri91si224qsgih"; - sgr-iosevka-ss05 = "1p2062x9wd5kkas3j5aqkx7r4asm2727i0sjf207w4lh3r37k9by"; - sgr-iosevka-ss06 = "0zcpnw5mk3js5rc0cgpn5fncqqwf5s032z04xbaagzsmp7f3f1p9"; - sgr-iosevka-ss07 = "09h686i2jq2p9i0684kjmsfgdpfwkbncbg3zxhz4m1x4wpfblhk8"; - sgr-iosevka-ss08 = "0jbzr6saijbmbj1dkc4djawr75agp2c8krsnwskqr9dhisrmnjfk"; - sgr-iosevka-ss09 = "10ffzi57gibz6w7yn4ign8vn6cagc680jrv81aqdkgav2bx71z9g"; - sgr-iosevka-ss10 = "0d0wn7564zyvfk79hfqgnm3aa94k8xbddgmmxpq5jk918a1m6614"; - sgr-iosevka-ss11 = "1zmbnhr1jz53yhighcn8dkj72s4y66ma61qjf5y3z64j7ql99kxi"; - sgr-iosevka-ss12 = "06czjy90yx7pv958agwwnwn2vpfv1ha2j90bmcjg2c6shvnz5hsr"; - sgr-iosevka-ss13 = "19k47hb167l6jsymznivdy6mgz228vcc4r5mzjjcszy4ba6n5qvg"; - sgr-iosevka-ss14 = "0nkj7jmpbwfq7pl7s3ih30zs0szqf7xsbjn70w5i5x2g8fc3sffj"; - sgr-iosevka-ss15 = "18l78cg3vxibngdbx2ikqhgz1v499ihf7bmdd5w92wrkkjgd0q8m"; - sgr-iosevka-ss16 = "00mn81r50aw3ymp3mnwb8j6z6n98y03z0g5b8jfybpah65rgsrra"; - sgr-iosevka-ss17 = "07vpvldkph4wn50vj5179h6zrw7vaf9mylksscw4wyqalinhiiqk"; - sgr-iosevka-ss18 = "1h0jq8d2lbh0lfsmqcwbw6q9fbhbfrnn3c58xnknr9ys32xc88l2"; - sgr-iosevka-term = "1j7sv5k4pbrq278nwfxshw23f7hdigy90w82a11s8nkq5b7f81wd"; - sgr-iosevka-term-curly = "1v3vcvq6p4a3y1alkg45l2jipf0mwsv4x57yxl0dd41fb30araxw"; - sgr-iosevka-term-curly-slab = "05is4yw7v32yf1h3b5j86wmz0x9fgbp5q99jw2zgn5lmv8x71dgh"; - sgr-iosevka-term-slab = "1a0fn07ykx93y2myxdmg4xnz67dwmdl66n8la8x1h502b4hacqpl"; - sgr-iosevka-term-ss01 = "1bwnyd6g0c185ny3d34pza1szc8pzkj15hk76g7s3jancgyajcj8"; - sgr-iosevka-term-ss02 = "17srbkd4pbr2wwzcw6ycm1c4n5jlk4p5wlm1baqfzvffldbp609k"; - sgr-iosevka-term-ss03 = "1w9ydkm0lsd0chyhi3b24n6syns55jwgnxkbnn7z7hh9llglplsj"; - sgr-iosevka-term-ss04 = "1znabmm2plb5w5f8qj61shzm4v6kdqdak547j64w768g6pgc61hh"; - sgr-iosevka-term-ss05 = "0pg3zannb29pxbfcjarj39my2lhwnid3yr7sbhk5i6sxy8klwjdv"; - sgr-iosevka-term-ss06 = "0n25hc5gfi4zcc2zr0r5zh0q8v16z8ak2iphh5406pdgj3n9lmi9"; - sgr-iosevka-term-ss07 = "0kmv8p689wf3mpiaq3749a3361nsckg0v4hsaw2mlshvhp4159h4"; - sgr-iosevka-term-ss08 = "04g0q2pgimj73hgxr9nv8qmbc6n6fsadhy5x3l3cwcw7wh7s0g37"; - sgr-iosevka-term-ss09 = "19qssfrmkvdq7bl0bg3a9v6sgnn2hg93kq0qh4j9chr7ffxnlmb2"; - sgr-iosevka-term-ss10 = "1qc3cfw9f959h1gafhsddrlw2cbvazv17yllsj6rw4rff3bqscaq"; - sgr-iosevka-term-ss11 = "1jbz5qg2vgrqmhbz8yvmampv7zkmksilvd7y2zrz4h5s2jbr32sg"; - sgr-iosevka-term-ss12 = "0afcjcpb4dw4d3dggm82yls09rl71x4jqavbil4z7br96vgipdg9"; - sgr-iosevka-term-ss13 = "04zbhi5mpycb9c6gf5ci1h6pbghy8vmajmzifcpg8d0fb9vyz370"; - sgr-iosevka-term-ss14 = "0bps3zgarjdq5xn92rgdasnhcqlrmxwpa4bv9wr40df7zxhlvkr4"; - sgr-iosevka-term-ss15 = "0ylxgmrsl596zdlph2f2lcfy9a37wi0x7418y53g43bdd33kcpxp"; - sgr-iosevka-term-ss16 = "1ql8x3r19sa36424wijrzxnl3mfz7rjnwlavd0bz8qinfdvjvdsf"; - sgr-iosevka-term-ss17 = "0plhqk7j64wfs61snly0m49lghk4srmribfqlzdk9xrvnv9h7zv1"; - sgr-iosevka-term-ss18 = "1h7z1cnd4ia1pbyj5sq1718z8n747cq8kdy97c4vdmw6gjl8wp5x"; + iosevka = "0nh0vsm9gpl5fsyfp11f8ks5jk4wf5r0nhqq92p7fdyrv6x8ygci"; + iosevka-aile = "0hjys81klq8f2vhk68bmd2vd6fzpbhvkx74jxbfi6fq487a5g6ix"; + iosevka-curly = "06npnjgwn3a78p3i5pdjs4bg69r3jz7y25qdii6wri3zna21w55r"; + iosevka-curly-slab = "0mr8v0k8v9b45hyylmyjqa2npi16zq0ga4kdx7782qy5x96fxkwh"; + iosevka-etoile = "0q1w9xqjr7zfghpvqp1c54y8z1i353fgfshj11bva3bb1vcgllk7"; + iosevka-slab = "1pppsjj8nwg76lidv52z0swlhrg44lw5y0kcv5hw56cgz17vnhw0"; + iosevka-ss01 = "1xj6zsadpxd7rcx5sklvzbcis09xpkdj0rcxjb87d6da6x52897a"; + iosevka-ss02 = "0nj50p4wbin3cjsyw1mviy4s4asy77z8kgmbwl43cqyh8693q61i"; + iosevka-ss03 = "0ksdy6dz5nh13j95vq6r0z56lgzw9rxk6w3c1g4h9qr8x0h81i9s"; + iosevka-ss04 = "0qyrycc0ly69hs8zva0mqlbpxqcx4kcpw05li96bbigjv481li5g"; + iosevka-ss05 = "01kyjl53afz6s21ca7csr1pmn2b80cr55raq9maacx7dkphs85pk"; + iosevka-ss06 = "0ay7qzh17l3fpsfj48kiadbvs02v8jh3g0xz6rr6948z08sw2qx2"; + iosevka-ss07 = "0wwn88y7k6gxwvg34wpfg95biip45viarm5h4dv06ygfl8sjva1a"; + iosevka-ss08 = "00y5l3zb1b3l6yh0m5v80jwhkdj1njnk165wnjbg1w5qgl0yr3ww"; + iosevka-ss09 = "1f42cwz34zqc8dkw1ahypj5f31fsxs9rx3zyqk58w7pn85sjq3n6"; + iosevka-ss10 = "0bvip0lvmh11x0l0pj94n1akn0y18srai0k737xdn5s1h86jg2nf"; + iosevka-ss11 = "0m4h9i7fmicxh3g57fprcgfhh4255vyc5sdkvd5iv225bwsfr4mr"; + iosevka-ss12 = "13qxfz3d2h1w8gicssadgfr5inr6i7mmyjni4wi2ij6p4y0dlg5f"; + iosevka-ss13 = "0q5xkxv040j1h1p11w6b0ngyzjkhhfzclxssrcyaxfkcnn7nkfqq"; + iosevka-ss14 = "0xkhcjzha9kkgymcq18n50jp1ikd0n8nisii40ihibiifcgrfp28"; + iosevka-ss15 = "17m7v4p62apnj7i86b6gm6yg1kyyawjly9qch1ii1wawj6aixyrp"; + iosevka-ss16 = "1amyc0f1mmwqz161m9jxgasgij6bzxazm6r4r1y1z800z6zd03hm"; + iosevka-ss17 = "0ia2p364avlad7v0z50zvzkaj33c2ys90dywy8i877nh2hzj61ky"; + iosevka-ss18 = "12rfjmfc8vkj6r91idlic2gpmr7gba2dg79s71jgiclkfr0fsb1m"; + sgr-iosevka = "1wqcx09aps43yavm5gm43xgq5xzrs0bs6abspqxzg7hpzfh0s5fn"; + sgr-iosevka-aile = "0335bfjc0ddia8y2sv6h5x4hdg1abwsdfy3cb59w25y46l7vlk3k"; + sgr-iosevka-curly = "1clspm5b30253d5qg23sklvgvvcnvrhb7hjxgyglg6abksw1r7xj"; + sgr-iosevka-curly-slab = "0m9km2bvjmd09nj4gqwnjxik4iq7qabcaa42r5kdkj2b214hz622"; + sgr-iosevka-etoile = "0yg0086d4dl5faadcvv20kbppi75msc8680v8w8g8db2w6b0ahfh"; + sgr-iosevka-fixed = "19msi71p9d2kvm2yr6gxg08wzhnhx3vxn7ivq89yxs4793mznbza"; + sgr-iosevka-fixed-curly = "0fxwlcpl8mxkk4gcs53fadfcc3fayyg3vpplvvhq6vj6rh4fsmjd"; + sgr-iosevka-fixed-curly-slab = "1kfvzan5h6b790ci9b8dsv3k89l181fj39x0yn2i4va10vhrif8j"; + sgr-iosevka-fixed-slab = "0h7rnmrabay0qvs2l40s2sn5hlx1q02n1wdl9zbjnc0mkhlyhpav"; + sgr-iosevka-fixed-ss01 = "0ssyd2x43bxv7b3giirsnxr6mp33l27iph8gcfnb7bqxb6iy8iar"; + sgr-iosevka-fixed-ss02 = "0vliidfhihkvhslhbd39kj4f909k9m3jl0dkjvlyxhwcabydcqwp"; + sgr-iosevka-fixed-ss03 = "1l2b2svij67m2dgv036a0sv66w84j64wgizv1m4zk1i70i529l4a"; + sgr-iosevka-fixed-ss04 = "0g32q7l5ppl15jvfdhl3hr1a3jm48bzsqsdw5zby1qi9v004bcq6"; + sgr-iosevka-fixed-ss05 = "0rf36r4yidjfid5rxvsg2pxmlzhk48vb307ilyqahdlffhncac9f"; + sgr-iosevka-fixed-ss06 = "170m8fsgy0spv311ddg11nzhpf030b0psxd7q654xylfcbldzwxa"; + sgr-iosevka-fixed-ss07 = "16vym343hp6m9ln4swlypws9sbwn4grj772yxckfdj1w91hk9a3a"; + sgr-iosevka-fixed-ss08 = "13xrjbxss2dahqnxalr5afky8056ysdrw9m2schnd9r885lfjdaw"; + sgr-iosevka-fixed-ss09 = "1v11x60fnrchghvj0m10dzi17b2i844588gkrn71bz5xjdvd2cf9"; + sgr-iosevka-fixed-ss10 = "1hi5wsf2fjs1j6iahlv9pyhfzswz1sly89wi2lw4ll5s42na31qb"; + sgr-iosevka-fixed-ss11 = "1mzz3rvg35k796rra19rb5zmffwhjfr6q8q5632cjygiqizd99k2"; + sgr-iosevka-fixed-ss12 = "11k9z0k0p0nf9c6yi5m19nnzf6pbq6zqjlcp9cz4snz91wg4py9b"; + sgr-iosevka-fixed-ss13 = "1mdwd5xb0c5ypjbr6bgd378kid01lqq2knmrbvlq7py145c8wnhq"; + sgr-iosevka-fixed-ss14 = "0qzr0iw1axpn1dv5zpkcnk5r7678093q7cas9kbf4nb69r59zg3w"; + sgr-iosevka-fixed-ss15 = "13aqp10x0zdah7337pl8wr0v0w61yj70pracxh9znwl5a62rq98l"; + sgr-iosevka-fixed-ss16 = "082zh32xghi7vavadgkx85lbqsmmzn9dv26ywvzkw9kf8v1kp931"; + sgr-iosevka-fixed-ss17 = "0biijj9iwpa8i5sg721r3a6i3mbmyz9hc7j35dqxjvzyxa1c8lqf"; + sgr-iosevka-fixed-ss18 = "07s5lq0cm00ja3l0wq01y5nky7jhjsizx71rz63p1ln7iakq84fl"; + sgr-iosevka-slab = "1sqw8v56qgs5hvnm48psdv27gs83mn37hiqzskgqbyx1njkncrw1"; + sgr-iosevka-ss01 = "094bx7vkqjx4wpc0wqylviwy0k00w4wshngw6nk4mgsxbirxlvnm"; + sgr-iosevka-ss02 = "1m7ny32qx7s42lvnq6xw45ij7l270wj1nk2dkjdpfsagfyg869kv"; + sgr-iosevka-ss03 = "1z947mrpr9lz7wk3357y81yb8adqi8hn32bqm14bp330n658a5jj"; + sgr-iosevka-ss04 = "0jn0g2hy7l98sw3z1wvr263fqca6a4cmljsfam6qm48z3izcya2n"; + sgr-iosevka-ss05 = "0k5s1q84ssy95k4szd614y9f8cibhj7an9lalb5h4ds4mbmhsc4y"; + sgr-iosevka-ss06 = "170jz7fppj4zc1ik033jbkp71grkm2fyfybvy48zdbdzan050b87"; + sgr-iosevka-ss07 = "1s8y27fv0klijsz9wac7nyxcj8mqcj3a09qmifaqvx80zl50yjwy"; + sgr-iosevka-ss08 = "0002i1411s82qm75hmdshry4k5fs1bsj4s8ardy8llpfs3z9w501"; + sgr-iosevka-ss09 = "16l3099djsxb42j51yr21xjamws731f87c2dgrkxhf2hy8rr2pv4"; + sgr-iosevka-ss10 = "1r67zpqai0c4cjpfslapdp411c62vlbjsf2qdwws5fk0s6sk4wra"; + sgr-iosevka-ss11 = "0y2qbrgsfcssqwq8ljqhz7wzpyg5z7ji5a35w9dp7wfaz4fmiifh"; + sgr-iosevka-ss12 = "1zy4972m7wdawjx4rlwkf78fg6l53gyqc368dk8c0ng5sz5s5jc9"; + sgr-iosevka-ss13 = "0yrg0pdandgqcz3dqjm5y8kaapryxynrj9v2br542vh6vp0w13zn"; + sgr-iosevka-ss14 = "1c0bh3qach06wiprpi3mglnkzmmb6asah9d1s9g2vpx825vvwf6f"; + sgr-iosevka-ss15 = "0qqqjh1rlz3al9qs09iqzgmsjww1cnp4vy700b2hmdhl46rjjipy"; + sgr-iosevka-ss16 = "030x1234vhnryvy4hlw5b42blx2yrm0kikr07clmp8fqvdba1wy1"; + sgr-iosevka-ss17 = "0k1sjpphgajdxk1l41fhfl93mj58ijhyba40m4h261p58ygbnszv"; + sgr-iosevka-ss18 = "1sf5zcp3js6hsm47mr4kbx7q4x1kk999080jfx118yfvgj5whmq1"; + sgr-iosevka-term = "0vxgcp3mi1brbcz6xvf6y3kbfd11x35blkf2aa82f47yqh26n96w"; + sgr-iosevka-term-curly = "0fgvsq28g63xbcxbcfrkbina5cvvj6c677mgadhbvyjml4lm57pz"; + sgr-iosevka-term-curly-slab = "0sqi5iz4pz7l5jqxw0a150j3nffzivlpzsaglzfrq50xcqqk3an1"; + sgr-iosevka-term-slab = "1yihqfandm61rfkiifw7mxi10b59cvf41k4mgviw9ylrg7ca47km"; + sgr-iosevka-term-ss01 = "10phwnsc4my2gr38974mf1qy4fwp9bqd06bwqcafxvp776s0ya1x"; + sgr-iosevka-term-ss02 = "0zvi1114hw4xp68cgyp8n4i7lfm547l9awz1ffkvj07l5zshhjpf"; + sgr-iosevka-term-ss03 = "1g1l9dq0fgywfxzdlwc0h8a8x8178m7x74rms6vwsgjgjfz83cca"; + sgr-iosevka-term-ss04 = "13gcv4nn06jwafm74km0j48lmfjyi5x0hcgf1wrbhrabd06vrbc5"; + sgr-iosevka-term-ss05 = "13i912b8s42gjcxrhiqp26779zfpy38rr8pf2gyb5njv4pvxxk6m"; + sgr-iosevka-term-ss06 = "1k631gf37maz6zi1cf46nr93x7lvdmdl43ri4c9mbx1q5f36ys8w"; + sgr-iosevka-term-ss07 = "0zr85cmrg4my5f255wbg27rhlkflsbp2jksrhgm4f6a2fn2qn0fy"; + sgr-iosevka-term-ss08 = "1y9ly507xqp6h3bldfw1fji1gxszpj3jxv1by4b3r1as63vdhqkj"; + sgr-iosevka-term-ss09 = "198myb085pp427lwf7ih2kddh52jpn1930p6a8q1n6fig1vbk76x"; + sgr-iosevka-term-ss10 = "1csdkbfffjpcqhhf9n7c3gxar2403x2zwqg7nlsnih1hgpvhvxx8"; + sgr-iosevka-term-ss11 = "0yid9w70jqvy4a6mglfi3n12g0k0ad52zdx0szgjsrbw98mfrqdr"; + sgr-iosevka-term-ss12 = "08ad3mwp3rfd3mikah9nhcn4d3is5gqqfza3vz3ddnj48fdqd4sm"; + sgr-iosevka-term-ss13 = "0myic6pzhdbmcp8fdhc5idsspsrrrxvb7m7ycc8vigqd1inmz091"; + sgr-iosevka-term-ss14 = "1yw6zv4hfksmkdh0403l6dmc54hd04qfzafhvhc5r53kd4ja1k93"; + sgr-iosevka-term-ss15 = "1y9gclnvidhadcr842ah3s16wrv0mbil7z5varri9hambaryz3z5"; + sgr-iosevka-term-ss16 = "0qn3k93scc6hsxayfzagdgxqiv40vgz0ac0fa93zdyp5krb46rff"; + sgr-iosevka-term-ss17 = "1l7jfb3x83kxlhj4zi8w1adxzf6k66zdzp93zif0mhvk9718ckws"; + sgr-iosevka-term-ss18 = "19ip13fmkrismwm1ymhwfsv9a4w57460dkjmngpk2kp1av5nqc0m"; } diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/data/fonts/khmeros/default.nix new file mode 100644 index 0000000000000..28db0d00981dc --- /dev/null +++ b/pkgs/data/fonts/khmeros/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "5.0"; +in +fetchzip { + name = "khmeros-${version}"; + url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; + sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "KhmerOS Unicode fonts for the Khmer language"; + homepage = "http://www.khmeros.info/"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/data/fonts/lklug-sinhala/default.nix new file mode 100644 index 0000000000000..45f907f1cf079 --- /dev/null +++ b/pkgs/data/fonts/lklug-sinhala/default.nix @@ -0,0 +1,23 @@ +{ fetchzip, lib }: + +let + version = "0.6"; +in +fetchzip { + name = "lklug-sinhala-${version}"; + url = "mirror://debian/pool/main/f/fonts-lklug-sinhala/fonts-lklug-sinhala_${version}.orig.tar.xz"; + sha256 = "sha256-Fy+QnAajA4yLf/I1vOQll5pRd0ZLfLe8UXq4XMC9qNc="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lklug-sinhala-${version}/lklug.ttf + ''; + + meta = with lib; { + description = "Unicode Sinhala font by Lanka Linux User Group"; + homepage = "http://www.lug.lk/fonts/lklug"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix new file mode 100644 index 0000000000000..1aac2c53d8219 --- /dev/null +++ b/pkgs/data/fonts/nanum/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "20170925"; +in +fetchzip { + name = "nanum-${version}"; + url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; + sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Nanum Korean font set"; + homepage = "https://hangeul.naver.com/font"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix new file mode 100644 index 0000000000000..1b574e2da2de7 --- /dev/null +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "3.003"; +in +fetchzip { + name = "sil-padauk-${version}"; + url = "mirror://debian/pool/main/f/fonts-sil-padauk/fonts-sil-padauk_${version}.orig.tar.xz"; + sha256 = "sha256-oK+EufbvsqXunTgcWj+DiNdfpRl+VPO60Wc9KYjZv5A="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Burmese Unicode 6 TrueType font"; + homepage = "https://software.sil.org/padauk"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/data/fonts/takao/default.nix new file mode 100644 index 0000000000000..dcbce858e0118 --- /dev/null +++ b/pkgs/data/fonts/takao/default.nix @@ -0,0 +1,27 @@ +{ fetchzip, lib }: + +let + version = "00303.01"; +in +fetchzip { + name = "takao-${version}"; + url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; + sha256 = "sha256-TlPq3iIv8vHlxYu5dkX/Lf6ediYKQaQ5uMbFvypQM/w="; + + postFetch = '' + unpackDir="$TMPDIR/unpack" + mkdir "$unpackDir" + cd "$unpackDir" + tar xf "$downloadedFile" --strip-components=1 + mkdir -p $out/share/fonts + cp *.ttf $out/share/fonts + ''; + + meta = with lib; { + description = "Japanese TrueType Gothic, P Gothic, Mincho, P Mincho fonts"; + homepage = "https://launchpad.net/takao-fonts"; + license = licenses.ipa; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/data/fonts/tibetan-machine/default.nix new file mode 100644 index 0000000000000..67393a9c4ab94 --- /dev/null +++ b/pkgs/data/fonts/tibetan-machine/default.nix @@ -0,0 +1,22 @@ +{ fetchzip, lib }: + +let + version = "1.901b"; +in +fetchzip { + name = "tibetan-machine-${version}"; + url = "mirror://debian/pool/main/f/fonts-tibetan-machine/fonts-tibetan-machine_${version}.orig.tar.bz2"; + sha256 = "sha256-A+RgpFLsP4iTzl0PMRHaNzWGbDR5Qa38lRegNJ96ULo="; + + postFetch = '' + mkdir -p $out/share/fonts + tar xf $downloadedFile --strip-components=1 -C $out/share/fonts ttf-tmuni-${version}/TibMachUni-${version}.ttf + ''; + + meta = with lib; { + description = "Tibetan Machine - an OpenType Tibetan, Dzongkha and Ladakhi font"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ serge ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e99d660bcf30d..9454a39d9d718 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "762464dcc5ce93f1c6a9a746feb6bd1bd0c47006", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/762464dcc5ce93f1c6a9a746feb6bd1bd0c47006.tar.gz", - "sha256": "0k1qp34lsc08a99p669v8n0fxs6mdzwc2bz87v0hdah4qagi4z4g", - "msg": "Update from Hackage at 2022-04-20T23:34:08Z" + "commit": "08ae12813ead00810e00ffe9dae284fcafe6a08a", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/08ae12813ead00810e00ffe9dae284fcafe6a08a.tar.gz", + "sha256": "00jc08pifnp791s1scscdhgwlf75v9682a7vjis1djnhj3y5s3ny", + "msg": "Update from Hackage at 2022-05-01T06:09:30Z" } diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index 9d9f28a795383..3db4d4eb819ca 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -1,6 +1,6 @@ -{ callPackage, lib, pkgs }: +{ config, lib, pkgs }: -rec { +lib.makeScope pkgs.newScope (self: with self; { # Dependencies espeak = pkgs.espeak-ng; @@ -40,4 +40,4 @@ rec { name = "all-wrapped"; appls = [ durden pipeworld ]; }; -} +}) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index 46012d69d2ddc..5447105d35816 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+date=2022-03-11"; + version = "0.6.1+date=2022-04-16"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fec2a1051500df28becce188d932645743091efa"; - hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; + rev = "b07ba6535addf0d36a64385745cd9595f7d214b1"; + hash = "sha256-nDSuJrJvJOVpRax+AwuNAZ3Ioqfoo10EGCab1EiPbIY="; }; dontConfigure = true; diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 09f809aa47181..86ab425964027 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.pre+date=2021-12-03"; + version = "0.pre+date=2022-04-03"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; - hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; + rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; + hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; }; dontConfigure = true; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index c7da1e43a15cd..dbe3665f1ef88 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , substituteAll -, fetchpatch , accountsservice , adwaita-icon-theme , colord @@ -64,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BzLvp8QXHOCg7UEGWAtM41pXsQFSwOo20jkTSRN3fto="; + sha256 = "sha256-+zCv+Q++HSrVYQfW6fX4pKOq82NbvYiSDXW1aLt3Z4U="; }; patches = [ @@ -79,13 +78,6 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) - - # Fix Online Accounts configuration on X11 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch"; - sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 1083fe1110661..2815c3d53ea8d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; + sha256 = "LYjv61d+2viqrkMcd5um5uuWHuvd8FzKLsyhqgTbekA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 1ad36f7e96b74..e3b8d6c344da9 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; + sha256 = "9e6KYVj6EiYnQScmy4gATn4tBGrcMiFQViROWbdAY+o="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index f92b162476ae4..415fd7b80c94c 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -47,13 +47,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; + sha256 = "cZQhi/7EW5o+/avOb4RQ7Uw5dyIaHqQBTC5Fii/poVQ="; }; patches = [ diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix index e52445aa0b049..e52445aa0b049 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix new file mode 100644 index 0000000000000..8421bc5dac62d --- /dev/null +++ b/pkgs/desktops/lxde/default.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + inherit (pkgs) gtk2-x11; + + lxappearance = callPackage ./core/lxappearance { }; + + lxappearance-gtk2 = callPackage ./core/lxappearance { + gtk2 = gtk2-x11; + withGtk3 = false; + }; + + lxmenu-data = callPackage ./core/lxmenu-data { }; + + lxpanel = callPackage ./core/lxpanel { + gtk2 = gtk2-x11; + }; + + lxrandr = callPackage ./core/lxrandr { }; + + lxsession = callPackage ./core/lxsession { }; + + lxtask = callPackage ./core/lxtask { }; +}) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index c7b7599c31955..77129d3430768 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index fc9e97c7f6860..d4369a9073551 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz"; - sha256 = "1mph04r6l9bxml1brwifbnk6lkjxkzxx75b3g3myzijjv6f8wxw3"; - name = "bluedevil-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/bluedevil-5.24.5.tar.xz"; + sha256 = "1yhynfpgm2cwvimh63hihg5dm0hzjp20364bvjyyh108830rjsf9"; + name = "bluedevil-5.24.5.tar.xz"; }; }; breeze = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/breeze-5.24.4.tar.xz"; - sha256 = "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3"; - name = "breeze-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/breeze-5.24.5.tar.xz"; + sha256 = "18zhm9my0vhwiq95v3p48z8s5m4a5c7kw8n144ykqlm51nssc9c5"; + name = "breeze-5.24.5.tar.xz"; }; }; breeze-grub = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz"; - sha256 = "1p154g2x1g00iam2gkv7pml1r0b91b21s8fgrfrqg5pj45ysp5bc"; - name = "breeze-grub-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/breeze-grub-5.24.5.tar.xz"; + sha256 = "02lcv23l3zr0g6nggmrxz4pgq852fir9yramhaxmcg634pxiacni"; + name = "breeze-grub-5.24.5.tar.xz"; }; }; breeze-gtk = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz"; - sha256 = "0s51azc2xmh7agbqlm9rn39c5qh6rfwyc2dq4sfv6vspm1883zmj"; - name = "breeze-gtk-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/breeze-gtk-5.24.5.tar.xz"; + sha256 = "0c25z69lyjczm05jraqk2f09sipkhpsz5zirwzqdq3apip06qw93"; + name = "breeze-gtk-5.24.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz"; - sha256 = "038pglghl40nyq6lzydijy3wnr5agvfzddjxrf6lc9m6qapqd37v"; - name = "breeze-plymouth-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/breeze-plymouth-5.24.5.tar.xz"; + sha256 = "044sbffr4sqvgkfbraa4rvlsih7zz9b300hipp33mwhpzyjjcpdc"; + name = "breeze-plymouth-5.24.5.tar.xz"; }; }; discover = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/discover-5.24.4.tar.xz"; - sha256 = "0smhys51chvjh2ij4mk03cfnq09n8cq22iag1ld9j2125l5iwa99"; - name = "discover-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/discover-5.24.5.tar.xz"; + sha256 = "18a8z9ifyyjmmc620dsh491vb1q3q9bxd8gfjf5k87mgwmg1wmwk"; + name = "discover-5.24.5.tar.xz"; }; }; drkonqi = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz"; - sha256 = "1yn7yj8nwnxm1s0si2353wl17jv7c7l5dc7833ndl56phv2999x0"; - name = "drkonqi-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/drkonqi-5.24.5.tar.xz"; + sha256 = "1ps1p8pvp51rswynbv337qr3qj2z7r7kd9qpxgcrha9pql01h5gy"; + name = "drkonqi-5.24.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz"; - sha256 = "0aamfgc4bdrysq7ps134pf5v4bgiwrsxffi0nb6d8zazswgkfa41"; - name = "kactivitymanagerd-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kactivitymanagerd-5.24.5.tar.xz"; + sha256 = "0j6d50cjry4j3vzxb6hd4w95y2h3l0yfhyrhl693njr64aq7d4pa"; + name = "kactivitymanagerd-5.24.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz"; - sha256 = "1w2rhz32xaqhmq5lyvfmjrbssqf9f35k5fk02f05fz79yk9wir7z"; - name = "kde-cli-tools-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kde-cli-tools-5.24.5.tar.xz"; + sha256 = "0afksrxd6mq9rcvh3g8y05kl0la4wmn1yksif8p1bcxpd4sdvw77"; + name = "kde-cli-tools-5.24.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz"; - sha256 = "02spbx2rniiyvzj4qb6lgzj0f83k4vq53fk4i1m45438z7aslymi"; - name = "kde-gtk-config-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kde-gtk-config-5.24.5.tar.xz"; + sha256 = "0sg8kqlkklvjhj69z5wzhvi0hddxa192j4vc4wc9hmfl1wirr8cq"; + name = "kde-gtk-config-5.24.5.tar.xz"; }; }; kdecoration = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz"; - sha256 = "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c"; - name = "kdecoration-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kdecoration-5.24.5.tar.xz"; + sha256 = "1hjjl6k09zi8n9nblbcm69c3br6d4dhzaw55xyygglaz6kb8fc17"; + name = "kdecoration-5.24.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz"; - sha256 = "03b8d3kdzwpyqrqkmpswryksrhav3mwcnbyzdc3g2kpk2qnx68fp"; - name = "kdeplasma-addons-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kdeplasma-addons-5.24.5.tar.xz"; + sha256 = "03p8wmsb5nl7j6kwl6j8nwlf6v7snh933jyglgp2vnclqp1jpd9x"; + name = "kdeplasma-addons-5.24.5.tar.xz"; }; }; kgamma5 = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz"; - sha256 = "0z1zrw5id455idjbaqracs1vcwgs93an7w27ggfqs6i8nabrivbk"; - name = "kgamma5-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kgamma5-5.24.5.tar.xz"; + sha256 = "1i7i3dc5qfb3v9hz9w9hszr8jbbdbfq0b59a4bh1p6xakxx8k1l0"; + name = "kgamma5-5.24.5.tar.xz"; }; }; khotkeys = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz"; - sha256 = "033dgz8wbsw2nj133hnmygz1izmcpxdn80jbjbm66nhbbyq7bb2s"; - name = "khotkeys-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/khotkeys-5.24.5.tar.xz"; + sha256 = "06m7yrs75arwdfrkpkn9b5kiz2xlrsxlpsjr18j1pjhxras0f8vs"; + name = "khotkeys-5.24.5.tar.xz"; }; }; kinfocenter = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz"; - sha256 = "0f5q6ajyd794p1z9j3il8sajlqkdcnf06xq4612qxdp49nb88nyw"; - name = "kinfocenter-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kinfocenter-5.24.5.tar.xz"; + sha256 = "0c2bq7m8c9r17s8qalp4cdz1qimzwnvh9wrba4rqcmxwbv043ln1"; + name = "kinfocenter-5.24.5.tar.xz"; }; }; kmenuedit = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz"; - sha256 = "0ril8jxqkaavc4bkpksnyxn3bww7b81gnp9bnb17acrr2nd7wyhl"; - name = "kmenuedit-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kmenuedit-5.24.5.tar.xz"; + sha256 = "02il6bhayjni0jsx1d1cnmxv5yc7r0d02s2v6cs87fbdrnl7d9vq"; + name = "kmenuedit-5.24.5.tar.xz"; }; }; kscreen = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz"; - sha256 = "0shvhymdfxw1gz49y1s79zik9kkg5qh0mqdj6dx0s6r3w6vysj1h"; - name = "kscreen-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz"; + sha256 = "1g5mlc78giq8zrpyq6d2jhqgyj6yh2nhbqv6wjm9cdbq4nnm3hyr"; + name = "kscreen-5.24.5.tar.xz"; }; }; kscreenlocker = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz"; - sha256 = "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv"; - name = "kscreenlocker-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kscreenlocker-5.24.5.tar.xz"; + sha256 = "13prkdwxd200ps4cy6rf2n4g9ll6fp1f93dk1njr9ilzbj2a2w1j"; + name = "kscreenlocker-5.24.5.tar.xz"; }; }; ksshaskpass = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz"; - sha256 = "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l"; - name = "ksshaskpass-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/ksshaskpass-5.24.5.tar.xz"; + sha256 = "1jw3hfnlplqsss1h49p5f3722qc22ln22sahs5ypsxszmqihpqiz"; + name = "ksshaskpass-5.24.5.tar.xz"; }; }; ksystemstats = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz"; - sha256 = "1pa7xrw5ij32bm66pn72zkzz8y70fq71n4kigm9ixc1s2glkbiwd"; - name = "ksystemstats-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/ksystemstats-5.24.5.tar.xz"; + sha256 = "1xsrlwm1hhagwjyjm240bfmri24z88v95m9pz95dpbcllkwdib0b"; + name = "ksystemstats-5.24.5.tar.xz"; }; }; kwallet-pam = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz"; - sha256 = "0s6z7ds42a7kba25jd7pzylw7d2mc27xgymmdrpkg2afqanf3m4r"; - name = "kwallet-pam-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kwallet-pam-5.24.5.tar.xz"; + sha256 = "1smclklxcfbxxxi3lgw2p6wmvj50fg40323j1b8p5z731ywdk3i3"; + name = "kwallet-pam-5.24.5.tar.xz"; }; }; kwayland-integration = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz"; - sha256 = "1cnfb81yv6m37m2kyk523skqbk5in1kpbpxq60ivjri91sm4pryj"; - name = "kwayland-integration-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kwayland-integration-5.24.5.tar.xz"; + sha256 = "1v12631xdjdp2wkjvyls8g0sv18amy7g4mddrh45pybhpc3rcsl0"; + name = "kwayland-integration-5.24.5.tar.xz"; }; }; kwayland-server = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz"; - sha256 = "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"; - name = "kwayland-server-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kwayland-server-5.24.5.tar.xz"; + sha256 = "0ydj6p489psqblqd88lk04q62qn1spa1m0zdjq8d32a4g4lvxnid"; + name = "kwayland-server-5.24.5.tar.xz"; }; }; kwin = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kwin-5.24.4.tar.xz"; - sha256 = "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572"; - name = "kwin-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kwin-5.24.5.tar.xz"; + sha256 = "10mgbs1mbhjzbwx07q77wdzhj11yc156j75fbvy8mszb9hjiappk"; + name = "kwin-5.24.5.tar.xz"; }; }; kwrited = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz"; - sha256 = "0j86ih4g762a94cyzilcbigh7iv04a80bqrlxm02fbqhffv01mv2"; - name = "kwrited-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/kwrited-5.24.5.tar.xz"; + sha256 = "0gfjvj8wnfgb3s2daz7xpg9flc8xv6hk12z6ckbchq71w4gs6132"; + name = "kwrited-5.24.5.tar.xz"; }; }; layer-shell-qt = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz"; - sha256 = "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0"; - name = "layer-shell-qt-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/layer-shell-qt-5.24.5.tar.xz"; + sha256 = "0ydjfxrkmpi052gfhkccsp9m5az3z6qiggb5wx6cjz39q06614gm"; + name = "layer-shell-qt-5.24.5.tar.xz"; }; }; libkscreen = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz"; - sha256 = "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81"; - name = "libkscreen-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/libkscreen-5.24.5.tar.xz"; + sha256 = "1jbgq1ddl0q5y8cx4m7k5q38gl0kxv929wxr3hn3vr906fpiiwbz"; + name = "libkscreen-5.24.5.tar.xz"; }; }; libksysguard = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz"; - sha256 = "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn"; - name = "libksysguard-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/libksysguard-5.24.5.tar.xz"; + sha256 = "1v21xckvwx6xkiqihv3pc2ps5mmc4ahp5vadxm3lrh0pdqxb6v5h"; + name = "libksysguard-5.24.5.tar.xz"; }; }; milou = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/milou-5.24.4.tar.xz"; - sha256 = "0z7kmygvjzj30llwg8gpibjja2gzc09nh9pxrpy78pa1jxnas29i"; - name = "milou-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/milou-5.24.5.tar.xz"; + sha256 = "1rh5zy1x427cv07zmikmh0rmviz7vcvnz2pyravyfzaxay5lwnf1"; + name = "milou-5.24.5.tar.xz"; }; }; oxygen = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz"; - sha256 = "1d3sz2qc1cz9x6g04r0scvw9fmrazfn5v3iav4cn7wdkz8x06kc0"; - name = "oxygen-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/oxygen-5.24.5.tar.xz"; + sha256 = "1gh06wwm6gdjpsbjlxnrrlgsfd5w7lb0pddcml9l2w0dvlgfyn1v"; + name = "oxygen-5.24.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz"; - sha256 = "1havd775d4x2y36nkba2k6vdf839dspk10mxccnk2wkhdxmzfyk7"; - name = "plasma-browser-integration-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-browser-integration-5.24.5.tar.xz"; + sha256 = "1xybyn6vsahr5j0g57bsfxmz78w35ibzavcax1inrdlnb7sblrqv"; + name = "plasma-browser-integration-5.24.5.tar.xz"; }; }; plasma-desktop = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz"; - sha256 = "09fhqz2sp4caabr1li1shjd8l052vp4d10ci7pwsqj8f61331qmh"; - name = "plasma-desktop-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-desktop-5.24.5.tar.xz"; + sha256 = "0iic01iwg4bkp8sfp4mbm5lvbj98wjcyi0k79jfr1sx78dn7jn5g"; + name = "plasma-desktop-5.24.5.tar.xz"; }; }; plasma-disks = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz"; - sha256 = "1mi5fp3305kjw41zhbccxyg666gcmmrvckipjhnnnfwd3gl372ng"; - name = "plasma-disks-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-disks-5.24.5.tar.xz"; + sha256 = "1x3lm5cnwa51i8kcmp7pq29fpa9za3ypsmmldf2jbisawjnrb50k"; + name = "plasma-disks-5.24.5.tar.xz"; }; }; plasma-firewall = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz"; - sha256 = "0f9g5m2ddbp2axfxqc4d92fzg6r4z1l56i6nsry6nlz6cqky3fm2"; - name = "plasma-firewall-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-firewall-5.24.5.tar.xz"; + sha256 = "0mk9plb1rwng77qy55c7y7ga4fkafan89bf4vqsc4i9nfn49d944"; + name = "plasma-firewall-5.24.5.tar.xz"; }; }; plasma-integration = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz"; - sha256 = "1d2d7cmhdhmdzs91vpc2p3fg413daqhqilp8d2qbpsks5hyrkm3k"; - name = "plasma-integration-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-integration-5.24.5.tar.xz"; + sha256 = "0ynzx99jn4fqzbrv9mav0sw06rzf7mm1rv17g17vsxijwbhr0i6d"; + name = "plasma-integration-5.24.5.tar.xz"; }; }; plasma-mobile = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-mobile-5.24.4.tar.xz"; - sha256 = "1hgcnb4flw224j57fxkhaiwapymq6ccjwqj8s6jgqzc3ax0py0vr"; - name = "plasma-mobile-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-mobile-5.24.5.tar.xz"; + sha256 = "0400rwx4pbz4kfy06f2vxchlf9vr6dx71wsi6vir3vdmvl43yazd"; + name = "plasma-mobile-5.24.5.tar.xz"; }; }; plasma-nano = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-nano-5.24.4.tar.xz"; - sha256 = "1fdq4r5zlkf3qb0a47zv3apgnqs4gqqfj8pdlcmzkyn9xykzs9vw"; - name = "plasma-nano-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-nano-5.24.5.tar.xz"; + sha256 = "0zxvqzg1p6ci6581bh4nhsq2p6pq66pmvs93zlj89ml4am176213"; + name = "plasma-nano-5.24.5.tar.xz"; }; }; plasma-nm = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz"; - sha256 = "0bzc48vdrnd6n9qcm8ms7wrjm2yl7h9dik32arwdxx56vb7jhv08"; - name = "plasma-nm-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-nm-5.24.5.tar.xz"; + sha256 = "0adl5wfrz16hc7j64830cx1ga0bh9zd8bff95a30zdiggp7jc45f"; + name = "plasma-nm-5.24.5.tar.xz"; }; }; plasma-pa = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz"; - sha256 = "09fkaq2zzicgr214zi2wf7cirffm7mwh55bivvafblp1wlavkrgz"; - name = "plasma-pa-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-pa-5.24.5.tar.xz"; + sha256 = "1lgq2lydl65bh01043ji7kkignrb5lfcvbhy0g4g7lw778whv3q6"; + name = "plasma-pa-5.24.5.tar.xz"; }; }; plasma-sdk = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz"; - sha256 = "1zkggp9a1yz5mwwvndizwlan6wlb2fy8n940ljnhldccl91mgwzc"; - name = "plasma-sdk-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-sdk-5.24.5.tar.xz"; + sha256 = "0d35sckjvi77b3475pfh1ixdsdx0m7b0hbsx5rbjgj4b05cdpm0w"; + name = "plasma-sdk-5.24.5.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz"; - sha256 = "0jcsmmg0asf2npl3f1nbzazz3i8m9b34q55088k8jjakwwxqbwhz"; - name = "plasma-systemmonitor-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-systemmonitor-5.24.5.tar.xz"; + sha256 = "1vx0w5kmnp3chhydas7ijy8h1xf6dggd1ryhbr3k9qz2qihxfsqm"; + name = "plasma-systemmonitor-5.24.5.tar.xz"; }; }; plasma-tests = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-tests-5.24.4.tar.xz"; - sha256 = "1ms298h9wghj9gpi7laf1dsd7s3yiycy44k4s5v4id8vfarnbs27"; - name = "plasma-tests-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-tests-5.24.5.tar.xz"; + sha256 = "1aqmmix0ds9vg4cjj8dagaya10ainhcciixamdylz1p7vgzpsrkx"; + name = "plasma-tests-5.24.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz"; - sha256 = "1cqabdsg8v8b00ppbabrg2gih16lf79lr5i8mqvjnc73npacvzhy"; - name = "plasma-thunderbolt-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-thunderbolt-5.24.5.tar.xz"; + sha256 = "1q0r9l2b06qkbyxa25lvqdwz0rgcjvp48gwkw0xhhaf6fyaai1cl"; + name = "plasma-thunderbolt-5.24.5.tar.xz"; }; }; plasma-vault = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz"; - sha256 = "0rj9z2c52mya2fjm4bimqz5z3lj2qg764zri6bqwrgwgsjwc4s81"; - name = "plasma-vault-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-vault-5.24.5.tar.xz"; + sha256 = "16cyzyfzwqwqsg7hhg576acvxvbd12b7mznvicrrqnyf4wvw68l1"; + name = "plasma-vault-5.24.5.tar.xz"; }; }; plasma-workspace = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz"; - sha256 = "0w7cnawnpcg5zk9bycjcnc8yfz21whrhd9h2z7hizgfnj2q403jv"; - name = "plasma-workspace-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz"; + sha256 = "1xk4424az7sgb0kyysr1s2x756vj4km50xxzkn1s1kxyw28jd4dr"; + name = "plasma-workspace-5.24.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz"; - sha256 = "0hpg7nn5wsn56my48jk225x1qb70sgf3hf8q5swwqc1xc6xzcg14"; - name = "plasma-workspace-wallpapers-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-wallpapers-5.24.5.tar.xz"; + sha256 = "0aabmd4zswmzdy958y1yq0yp1v9i8kzl959d6r4pwi0lmhr6g6qi"; + name = "plasma-workspace-wallpapers-5.24.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz"; - sha256 = "0s5h25vyk5yzipwj91rb62xzgi6aafpwikh7ibpmmh2wn71x3amr"; - name = "plymouth-kcm-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/plymouth-kcm-5.24.5.tar.xz"; + sha256 = "04m4129hxgq4g9v8gvi8q0hzhqzd866j3j1ffxs5vfd27r155wcr"; + name = "plymouth-kcm-5.24.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.24.4"; + version = "1-5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz"; - sha256 = "1bc5ss6v4d7kwk1chhvpis5srs8lfypims46wgxjncyhjg2lcllm"; - name = "polkit-kde-agent-1-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/polkit-kde-agent-1-5.24.5.tar.xz"; + sha256 = "0w78c59nm71xnd5prm035z94r5bzlqr0fyri43a8vrfyyb21r9l9"; + name = "polkit-kde-agent-1-5.24.5.tar.xz"; }; }; powerdevil = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz"; - sha256 = "0sjlx5fhfdld1i352adi2bhyd29ja9lbmzhfxgnvmpfl6q7c0w7g"; - name = "powerdevil-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/powerdevil-5.24.5.tar.xz"; + sha256 = "1wr3rk318j93rnyh24icl4yxdj40zasymlddc71ram80fswa2k4n"; + name = "powerdevil-5.24.5.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/qqc2-breeze-style-5.24.4.tar.xz"; - sha256 = "1d0cgsxvnm0zza7n5hz47n28yrr35hp0vniggifncm0ag8sn0kmd"; - name = "qqc2-breeze-style-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/qqc2-breeze-style-5.24.5.tar.xz"; + sha256 = "1m0xnx46zkv1dlwkgns1ibgsl934jbcfz35jlm4p8l6n1y2jcjyg"; + name = "qqc2-breeze-style-5.24.5.tar.xz"; }; }; sddm-kcm = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz"; - sha256 = "0pfqp5das7pxpmh111i2dlfqm6xzzd99bcb32bbmd9v6w2wlgwxy"; - name = "sddm-kcm-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/sddm-kcm-5.24.5.tar.xz"; + sha256 = "15z5hfpczi73vqjfj9z2ai2r4187fyrvfnikcfb18g2bdh1n54ng"; + name = "sddm-kcm-5.24.5.tar.xz"; }; }; systemsettings = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz"; - sha256 = "0cqm7s89jvzqz1fw32284ppnm3dc69yvc8bqqgw5jdbbjnc1z4k9"; - name = "systemsettings-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/systemsettings-5.24.5.tar.xz"; + sha256 = "1rg9zx7fhrg91nlarv0cz384agbik47sccj7hhshnxnq1czvawjv"; + name = "systemsettings-5.24.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.24.4"; + version = "5.24.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz"; - sha256 = "07nwb6ff8rnlk2play9gar52d8d44b8y412hnx9a9d4b50b4js0i"; - name = "xdg-desktop-portal-kde-5.24.4.tar.xz"; + url = "${mirror}/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz"; + sha256 = "1zn6wln8pccj1x3labms7xippn6xgv4aamwpmzk2rvwss9jwz75m"; + name = "xdg-desktop-portal-kde-5.24.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 032209c2f1822..e26c90592252f 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , libxml2 @@ -27,13 +28,20 @@ stdenv.mkDerivation rec { patches = [ ./rox-filer-2.11-in-source-build.patch + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/rox-desktop/rox-filer/pull/15 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch"; + sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69"; + }) ]; # go to the source directory after unpacking the sources setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; - # patch source with defined patches - patchFlags = [ "-p0" ]; + # account for 'setSourceRoot' offset + patchFlags = [ "-p2" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch index 11bd80044595c..c68bba7ec6cf3 100644 --- a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch +++ b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch @@ -1,5 +1,5 @@ ---- src/configure 2011-10-09 16:32:14.000000000 +0200 -+++ src/configure2 2016-03-20 09:26:31.640891863 +0100 +--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200 ++++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100 @@ -2132,13 +2132,6 @@ diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 47fbcc5f38e74..badda3a6a57a0 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.31.0"; + version = "0.32.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-tpJUCHrSFNEzNrln7nKwav0GSBW+4fwjSB3WI1MKW9A="; + sha256 = "sha256-aYMfsaqdsxlWatvXBWIxKJ7baruH1kqp2nrXL+/IrUQ="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index e8c3af5d7e1e5..f8de9f57b5d3b 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.4.1" ; + versionPkg = "0.4.2"; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; - sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d"; + hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; }; postInstallContrib = lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; - sha256 = "0c4nqp6yzmpj0mcpg7ibmwyqi8hjw3sza8myvy4nzq3fa6wldy5l"; + hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index a41f836e10ca8..40fdcb29013ef 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.17.1"; + version = "2.29.2"; + # includes stanc binaries needed to build cmdstand src = fetchurl { url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; + sha256 = "sha256-VntTH6c//fcGyqF+szROHftB6GmTyvi6QIdf+RAzUVM="; }; buildFlags = [ "build" ]; @@ -14,7 +15,16 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ python3 ]; - checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368 + + postPatch = '' + substituteInPlace stan/lib/stan_math/make/libraries \ + --replace "/usr/bin/env bash" "bash" + patchShebangs . + ''; + + checkPhase = '' + ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface + ''; installPhase = '' mkdir -p $out/opt $out/bin @@ -28,6 +38,9 @@ stdenv.mkDerivation rec { chmod a+x $out/bin/stan ''; + # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. + preFixup = "rm -rf $(pwd)"; + meta = { description = "Command-line interface to Stan"; longDescription = '' diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index bfc2ab7f9b056..4a30107bbecac 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -87,10 +87,11 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ kuznero ]; + homepage = "https://dotnet.github.io/"; license = licenses.mit; + maintainers = with maintainers; [ kuznero ]; + mainProgram = "dotnet"; + platforms = builtins.attrNames srcs; }; } diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 37e91efa59c6d..97d3c78220a1a 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.17.7" = { + "@babel/compat-data-7.17.10" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz"; - sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; + sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.17.7" = { + "@babel/generator-7.17.10" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; - sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz"; + sha512 = "46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -76,22 +76,22 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.17.7" = { + "@babel/helper-compilation-targets-7.17.10" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; - sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; + sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.6" = { + "@babel/helper-create-class-features-plugin-7.17.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.6"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; - sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; + sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -121,22 +121,13 @@ let sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; - "@babel/helper-function-name-7.16.7" = { + "@babel/helper-function-name-7.17.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; - }; - }; - "@babel/helper-get-function-arity-7.16.7" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; + sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; }; }; "@babel/helper-hoist-variables-7.16.7" = { @@ -265,31 +256,31 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.17.8" = { + "@babel/helpers-7.17.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz"; - sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; + sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; }; }; - "@babel/highlight-7.16.10" = { + "@babel/highlight-7.17.9" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.10"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; + sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; }; }; - "@babel/parser-7.17.8" = { + "@babel/parser-7.17.10" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.8"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; - sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz"; + sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.16.8" = { @@ -652,13 +643,13 @@ let sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.17.7" = { + "@babel/plugin-transform-modules-commonjs-7.17.9" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.17.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz"; - sha512 = "ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz"; + sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw=="; }; }; "@babel/plugin-transform-modules-systemjs-7.17.8" = { @@ -679,13 +670,13 @@ let sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.17.10" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.8"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; - sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz"; + sha512 = "v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA=="; }; }; "@babel/plugin-transform-new-target-7.16.7" = { @@ -724,13 +715,13 @@ let sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.7" = { + "@babel/plugin-transform-regenerator-7.17.9" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; - sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz"; + sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ=="; }; }; "@babel/plugin-transform-reserved-words-7.16.7" = { @@ -850,22 +841,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.17.3" = { + "@babel/traverse-7.17.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.3"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz"; + sha512 = "VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw=="; }; }; - "@babel/types-7.17.0" = { + "@babel/types-7.17.10" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.0"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz"; + sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; }; }; "@hapi/address-2.1.4" = { @@ -913,6 +904,33 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; + "@jridgewell/gen-mapping-0.1.1" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + }; + "@jridgewell/set-array-1.1.1" = { + name = "_at_jridgewell_slash_set-array"; + packageName = "@jridgewell/set-array"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.13" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + }; + }; "@kwsites/file-exists-1.1.1" = { name = "_at_kwsites_slash_file-exists"; packageName = "@kwsites/file-exists"; @@ -1048,22 +1066,31 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.8" = { + "@types/http-proxy-1.17.9" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.8"; + version = "1.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz"; - sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; + sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; }; }; - "@types/jest-27.4.1" = { + "@types/jest-27.5.0" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "27.4.1"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz"; - sha512 = "23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-27.5.0.tgz"; + sha512 = "9RBFx7r4k+msyj/arpfaa0WOOEcaAZNmN+j80KFbFCoSqCJGHTz7YMAMGQW9Xmqm5w6l5c25vbSjMwlikJi5+g=="; + }; + }; + "@types/json-buffer-3.0.0" = { + name = "_at_types_slash_json-buffer"; + packageName = "@types/json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz"; + sha512 = "3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="; }; }; "@types/json-schema-7.0.11" = { @@ -1093,13 +1120,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-17.0.23" = { + "@types/node-17.0.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.23"; + version = "17.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; - sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz"; + sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; }; }; "@types/parse-json-4.0.0" = { @@ -1147,13 +1174,13 @@ let sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; }; }; - "@types/uglify-js-3.13.1" = { + "@types/uglify-js-3.13.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.2.tgz"; + sha512 = "/xFrPIo+4zOeNGtVMbf9rUm0N+i4pDf1ynExomqtokIJmVzR3962lJ1UE+MmexMkA0cmN9oTzg5Xcbwge0Ij2Q=="; }; }; "@types/webpack-4.41.32" = { @@ -1777,13 +1804,13 @@ let sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; - "async-2.6.3" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-each-1.0.3" = { @@ -2101,13 +2128,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.19.2" = { + "body-parser-1.20.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; + sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; }; }; "bonjour-3.5.0" = { @@ -2227,13 +2254,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.20.2" = { + "browserslist-4.20.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.2"; + version = "4.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; - sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; + sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; }; }; "buffer-4.9.2" = { @@ -2479,13 +2506,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001324" = { + "caniuse-lite-1.0.30001338" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001324"; + version = "1.0.30001338"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001324.tgz"; - sha512 = "/eYp1J6zYh1alySQB4uzYFkLmxxI8tk0kxldbNHXp8+v+rdMKdUBNjRLz7T7fz6Iox+1lIdYpc7rq6ZcXfTukg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; + sha512 = "1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2839,13 +2866,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.9.0" = { + "color-string-1.9.1" = { name = "color-string"; packageName = "color-string"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; - sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"; + sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; }; }; "colorette-1.4.0" = { @@ -2983,6 +3010,15 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; + "compress-brotli-1.3.8" = { + name = "compress-brotli"; + packageName = "compress-brotli"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz"; + sha512 = "lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -3109,13 +3145,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "cookie-0.4.2" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-signature-1.0.6" = { @@ -3163,13 +3199,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.21.1" = { + "core-js-compat-3.22.4" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.21.1"; + version = "3.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; - sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.4.tgz"; + sha512 = "dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA=="; }; }; "core-util-is-1.0.2" = { @@ -3622,13 +3658,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "define-property-0.2.5" = { @@ -3829,13 +3865,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; "domain-browser-1.2.0" = { @@ -3856,13 +3892,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.2.0" = { + "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; "domhandler-4.3.1" = { @@ -3964,13 +4000,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.103" = { + "electron-to-chromium-1.4.137" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.103"; + version = "1.4.137"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz"; - sha512 = "c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz"; + sha512 = "0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA=="; }; }; "elliptic-6.5.4" = { @@ -4054,13 +4090,13 @@ let sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; }; }; - "elm-tooling-1.7.0" = { + "elm-tooling-1.8.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.7.0.tgz"; - sha512 = "EHZ54voWrG3BhUONbH/wFw5U95H6N7R4QFgXHDrPIaDBDdeyNkpFu4QWArSWkhzxyCF7hqT8ya2yy7SferDsgg=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.8.0.tgz"; + sha512 = "IjMvW/VHqxLidlJSAocBGDBmqiZ1NS0lK/UCMRU4ULEEaTVjpSd/9Dv0mH2ok0H0egSTYx19GnrdL4Lq9h+z+A=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4171,13 +4207,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.19.2" = { + "es-abstract-1.20.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz"; - sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz"; + sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA=="; }; }; "es-to-primitive-1.2.1" = { @@ -4405,13 +4441,13 @@ let sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; - "express-4.17.3" = { + "express-4.18.1" = { name = "express"; packageName = "express"; - version = "4.17.3"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; "express-ws-2.0.0" = { @@ -4666,6 +4702,15 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "finalhandler-1.2.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + }; + }; "find-0.2.7" = { name = "find"; packageName = "find"; @@ -4819,13 +4864,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; }; "for-in-1.0.2" = { @@ -5044,6 +5089,24 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; @@ -5287,13 +5350,13 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "gzip-size-5.0.0" = { @@ -5350,13 +5413,13 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-bigints-1.0.1" = { + "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; }; "has-flag-3.0.0" = { @@ -5377,6 +5440,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -5629,15 +5701,6 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -6088,13 +6151,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.8.1" = { + "is-core-module-2.9.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-data-descriptor-0.1.4" = { @@ -6790,13 +6853,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.1.1" = { + "keyv-4.2.2" = { name = "keyv"; packageName = "keyv"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz"; - sha512 = "tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz"; + sha512 = "uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ=="; }; }; "killable-1.0.1" = { @@ -7555,13 +7618,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "moment-2.29.1" = { + "moment-2.29.3" = { name = "moment"; packageName = "moment"; - version = "2.29.1"; + version = "2.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; + sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; }; }; "move-concurrently-1.0.1" = { @@ -7672,13 +7735,13 @@ let sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; }; }; - "nanoid-3.3.2" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz"; - sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "nanomatch-1.2.13" = { @@ -7780,13 +7843,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.2" = { + "node-releases-2.0.4" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz"; + sha512 = "gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ=="; }; }; "node-watch-0.5.5" = { @@ -8770,13 +8833,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.12" = { + "postcss-8.4.13" = { name = "postcss"; packageName = "postcss"; - version = "8.4.12"; + version = "8.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; - sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; + sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; }; }; "postcss-calc-7.0.5" = { @@ -9346,6 +9409,15 @@ let sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; }; }; + "qs-6.10.3" = { + name = "qs"; + packageName = "qs"; + version = "6.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + }; + }; "qs-6.5.1" = { name = "qs"; packageName = "qs"; @@ -9373,15 +9445,6 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -9472,13 +9535,13 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.4.3" = { + "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.3"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; "rc-1.2.8" = { @@ -9670,13 +9733,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.14.5" = { + "regenerator-transform-0.15.0" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.5"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; + sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; }; }; "regex-not-1.0.2" = { @@ -9688,13 +9751,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.4.1" = { + "regexp.prototype.flags-1.4.3" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; - sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; "regexpu-core-5.0.1" = { @@ -10228,13 +10291,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "semver-regex-3.1.3" = { @@ -10273,15 +10336,6 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "send-0.17.2" = { - name = "send"; - packageName = "send"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; - }; - }; "send-0.18.0" = { name = "send"; packageName = "send"; @@ -10336,15 +10390,6 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.14.2" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; - }; - }; "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; @@ -10489,13 +10534,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.5.0" = { + "simple-git-3.7.1" = { name = "simple-git"; packageName = "simple-git"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; - sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz"; + sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A=="; }; }; "simple-swizzle-0.2.2" = { @@ -10948,22 +10993,22 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; }; }; - "string.prototype.trimstart-1.0.4" = { + "string.prototype.trimstart-1.0.5" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; }; }; "string_decoder-0.10.31" = { @@ -11524,13 +11569,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.3.1" = { + "tslib-2.4.0" = { name = "tslib"; packageName = "tslib"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; }; "tsyringe-4.6.0" = { @@ -11605,13 +11650,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typescript-4.6.3" = { + "typescript-4.6.4" = { name = "typescript"; packageName = "typescript"; - version = "4.6.3"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"; - sha512 = "yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; + sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; }; }; "uglify-es-3.3.10" = { @@ -11650,13 +11695,13 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; - "unbox-primitive-1.0.1" = { + "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -12732,7 +12777,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-errors-1.7.2" @@ -12940,7 +12985,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -12977,7 +13022,7 @@ in sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."moment-2.29.3" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -13109,7 +13154,7 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."body-parser-1.19.2" + sources."body-parser-1.20.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.1.2" @@ -13119,6 +13164,7 @@ in sources."lowercase-keys-2.0.0" ]; }) + sources."call-bind-1.0.2" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."clone-response-1.0.2" @@ -13128,44 +13174,44 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.17.3" // { - dependencies = [ - sources."serve-static-1.14.2" - ]; - }) + sources."express-4.18.1" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.3" ]; }) sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."got-9.6.0" + sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -13195,7 +13241,8 @@ in sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."on-finished-2.3.0" + sources."object-inspect-1.12.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" sources."p-cancelable-1.1.0" @@ -13208,9 +13255,9 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" @@ -13220,33 +13267,26 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - (sources."serve-static-1.15.0" // { - dependencies = [ - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."http-errors-2.0.0" - sources."ms-2.1.3" - sources."on-finished-2.4.1" - sources."send-0.18.0" - sources."statuses-2.0.1" - ]; - }) + sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."statuses-1.5.0" + sources."side-channel-1.0.4" + sources."statuses-2.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tmp-0.1.0" @@ -13395,7 +13435,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."fresh-0.5.2" sources."fsevents-2.3.2" sources."get-stream-4.1.0" @@ -13492,13 +13532,13 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -13548,8 +13588,9 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13559,6 +13600,7 @@ in sources."mimic-response-1.0.1" ]; }) + sources."compress-brotli-1.3.8" sources."config-chain-1.1.13" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" @@ -13568,7 +13610,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."got-10.7.0" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -13578,7 +13620,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.1.1" + sources."keyv-4.2.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -13595,7 +13637,7 @@ in sources."responselike-2.0.0" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -13697,7 +13739,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -13823,7 +13865,7 @@ in sources."compare-versions-3.6.0" sources."core-util-is-1.0.3" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13866,22 +13908,21 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.7" + sources."@babel/compat-data-7.17.10" sources."@babel/core-7.12.10" - sources."@babel/generator-7.17.7" + sources."@babel/generator-7.17.10" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.17.7" // { + (sources."@babel/helper-compilation-targets-7.17.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-class-features-plugin-7.17.9" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.16.7" - sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" @@ -13896,9 +13937,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.17.8" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.8" + sources."@babel/helpers-7.17.9" + sources."@babel/highlight-7.17.9" + sources."@babel/parser-7.17.10" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" sources."@babel/plugin-proposal-dynamic-import-7.16.7" @@ -13939,15 +13980,15 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.9" sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.10" sources."@babel/plugin-transform-new-target-7.16.7" sources."@babel/plugin-transform-object-super-7.16.7" sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-regenerator-7.17.9" sources."@babel/plugin-transform-reserved-words-7.16.7" sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.16.7" @@ -13961,26 +14002,29 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.17.3" - sources."@babel/types-7.17.0" + sources."@babel/traverse-7.17.10" + sources."@babel/types-7.17.10" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" + sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/sourcemap-codec-1.4.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.8" + sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.13.1" // { + (sources."@types/uglify-js-3.13.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14098,12 +14142,12 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.0" - (sources."body-parser-1.19.2" // { + (sources."body-parser-1.20.0" // { dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" ]; }) (sources."bonjour-3.5.0" // { @@ -14126,7 +14170,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.2" + sources."browserslist-4.20.3" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -14143,7 +14187,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001324" + sources."caniuse-lite-1.0.30001338" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14199,7 +14243,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.9.0" + sources."color-string-1.9.1" sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" @@ -14226,7 +14270,7 @@ in }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -14242,7 +14286,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.4" // { dependencies = [ sources."semver-7.0.0" ]; @@ -14265,7 +14309,7 @@ in sources."camelcase-6.3.0" sources."loader-utils-2.0.2" sources."lru-cache-6.0.0" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."yallist-4.0.0" ]; }) @@ -14299,7 +14343,7 @@ in sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-4.1.1" // { dependencies = [ @@ -14311,9 +14355,9 @@ in ]; }) sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."des.js-1.0.1" - sources."destroy-1.0.4" + sources."destroy-1.2.0" sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { dependencies = [ @@ -14331,9 +14375,9 @@ in sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domain-browser-1.2.0" - sources."domelementtype-2.2.0" + sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-case-3.0.4" @@ -14343,7 +14387,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.103" + sources."electron-to-chromium-1.4.137" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14365,7 +14409,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -14379,7 +14423,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.20.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -14428,12 +14472,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.17.3" // { + (sources."express-4.18.1" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -14491,7 +14535,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -14507,7 +14551,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -14522,6 +14566,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.1" @@ -14550,7 +14596,7 @@ in sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" (sources."gzip-size-5.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -14560,8 +14606,9 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-bigints-1.0.1" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -14595,7 +14642,7 @@ in sources."html-webpack-plugin-4.5.0" sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" @@ -14649,7 +14696,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.8.1" + sources."is-core-module-2.9.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -14769,7 +14816,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" sources."nan-2.15.0" - sources."nanoid-3.3.2" + sources."nanoid-3.3.4" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.3" @@ -14791,7 +14838,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.4" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14828,7 +14875,7 @@ in sources."object.pick-1.3.0" sources."object.values-1.1.5" sources."obuf-1.1.2" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" @@ -14892,7 +14939,7 @@ in sources."pkginfo-0.4.1" (sources."portfinder-1.0.28" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."debug-3.2.7" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -14931,7 +14978,7 @@ in sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.1.1" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."yallist-4.0.0" ]; }) @@ -15024,7 +15071,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.4.12" + sources."postcss-8.4.13" ]; }) sources."postcss-selector-parser-6.0.10" @@ -15068,7 +15115,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.4.3" // { + (sources."raw-body-2.5.1" // { dependencies = [ sources."bytes-3.1.2" ]; @@ -15128,9 +15175,9 @@ in sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" + sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.0.1" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { @@ -15180,7 +15227,7 @@ in sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-5.7.1" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ @@ -15194,13 +15241,15 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."ms-2.0.0" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -15308,7 +15357,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" @@ -15320,8 +15369,8 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -15350,7 +15399,7 @@ in sources."css-what-3.4.2" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.2.0" + sources."domelementtype-2.3.0" ]; }) sources."domelementtype-1.3.1" @@ -15400,7 +15449,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.3.1" + sources."tslib-2.4.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -15435,7 +15484,7 @@ in sources."yallist-2.1.2" ]; }) - sources."unbox-primitive-1.0.1" + sources."unbox-primitive-1.0.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -15681,7 +15730,7 @@ in sha512 = "DKhH6o+SNo3m8y9qAM932/gLMK0YmNSJevHdBYkaDWfKiw+vlo4Wtfskb8CI8ZAzWrAOcDNiLCsEbSsbPHk2Vg=="; }; dependencies = [ - sources."@types/jest-27.4.1" + sources."@types/jest-27.5.0" sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" sources."balanced-match-1.0.2" @@ -15726,7 +15775,7 @@ in sources."supports-color-7.2.0" sources."temp-0.9.4" sources."ts-union-2.3.0" - sources."typescript-4.6.3" + sources."typescript-4.6.4" sources."which-1.3.1" sources."wrappy-1.0.2" ]; @@ -15743,18 +15792,19 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.1.tgz"; - sha512 = "leDgjvE6ldYSOG/jMLmMw2g1vRnrd9nH9mnQcJt57SY2F4FnZT2hfIbuIUBXPaBwhWwC0a6BRt+Jv/2sGOG03A=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.2.tgz"; + sha512 = "llkRvxgR2GOmtc7wi2vAM+u9j61Pf1fmPsAbpsE4X0ZfusJv0Dddor3lHNNZ0MmpYzNxpm7npxNqYRXs5JIz9A=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -15786,6 +15836,7 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.4" @@ -15793,7 +15844,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."duplexer3-0.1.4" - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -15808,7 +15859,7 @@ in sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."got-10.7.0" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" sources."ieee754-1.2.1" @@ -15824,7 +15875,7 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.1.1" + sources."keyv-4.2.2" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -15905,8 +15956,8 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.3.5" - sources."simple-git-3.5.0" + sources."semver-7.3.7" + sources."simple-git-3.7.1" sources."upath-2.0.1" sources."yallist-4.0.0" ]; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index fc0f50d0797fb..eb81efe2de0c6 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -64,9 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ML-like functional programming language aimed at program verification"; homepage = "https://www.fstar-lang.org"; - license = licenses.asl20; changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; - platforms = with platforms; darwin ++ linux; + license = licenses.asl20; maintainers = with maintainers; [ gebner pnmadelaine ]; + mainProgram = "fstar.exe"; + platforms = with platforms; darwin ++ linux; }; } diff --git a/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch index d9809e828f10c..77202438e47d8 100644 --- a/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch +++ b/pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -222,16 +222,16 @@ index de920d714c6..665fb74bd6b 100644 +#ifdef __USING_MCFGTHREAD__ + +#include <mcfgthread/gthread.h> -+ ++namespace __cxxabiv1 { +extern "C" int -+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), ++__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *), + void *obj, void *dso_handle) + _GLIBCXX_NOTHROW +{ + return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; + (void)dso_handle; +} -+ ++} +#else // __USING_MCFGTHREAD__ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 2153a30cb160b..f073eca91d5c4 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -31,13 +31,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "5.0.2"; + version = "5.1.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - hash = "sha256-w023vBLJaiFbRdvz9UfZLPasRjk3VqM9zwctCIJ5hGU="; + hash = "sha256-/kIZrbzq1u1pIs1jlmRYZNUGteqVQTI4TlXsHsVIUKE="; }; # - fix bash paths @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "hip"; - version = "5.0.2"; + version = "5.1.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - hash = "sha256-hhTwKG0wDpbIBI8S61AhdNldX+STO8C66xi2EzmJSBs="; + hash = "sha256-TuCMRJb6G/bhD8hG6Ot7MIkgBoShjVboeXrlGh9eYpQ="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 176affd047c9a..0eab971fb977d 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -9,6 +9,8 @@ , lld_11 , opencl-clang , python3 +, spirv-tools +, spirv-headers , spirv-llvm-translator , buildWithPatches ? true @@ -18,8 +20,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872"; - sha256 = "Vg1mngwpIQ3Tik0GgRXPG22lE4sLEAEFch492G2aIXs="; + rev = "v0.3.0"; + sha256 = "sha256-1Rm4TCERTOcPGWJF+yNoKeB9x3jfqnh7Vlv+0Xpmjbk="; }; llvmPkgs = llvmPackages_11 // { inherit spirv-llvm-translator; @@ -31,18 +33,18 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.8744"; + version = "1.0.11061"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "G5+dYD8uZDPkRyn1sgXsRngdq4NJndiCJCYTRXyUgTA="; + sha256 = "sha256-qS/+GTqHtp3T6ggPKrCDsrTb7XvVOUaNbMzGU51jTu4="; }; nativeBuildInputs = [ clang cmake bison flex python3 ]; - buildInputs = [ clang opencl-clang spirv-llvm-translator llvm lld_11 ]; + buildInputs = [ spirv-headers spirv-tools clang opencl-clang spirv-llvm-translator llvm lld_11 ]; strictDeps = true; @@ -52,6 +54,21 @@ stdenv.mkDerivation rec { # https://github.com/intel/intel-graphics-compiler/issues/98 doCheck = false; + postPatch = '' + substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \ + --replace '$'''{SPIRV-Tools_DIR}../../..' \ + '${spirv-tools}' \ + --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ + 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ + --replace 'set_target_properties(SPIRV-Tools' \ + 'set_target_properties(SPIRV-Tools-shared' \ + --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ + 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' + substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" + ''; + # Handholding the braindead build script # cmake requires an absolute path prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' @@ -64,8 +81,9 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-Wno-dev" "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" - "-DINSTALL_SPIRVDLL=0" + "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" "-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}" diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7642ae4aff265..dbacda5c4798a 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "A workbench for high-assurance and high-speed cryptography"; homepage = "https://github.com/jasmin-lang/jasmin/"; - platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "jasminc"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 18fd44612f100..e700e1a08b2cc 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.0.2"; + version = "5.1.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-wPzwbeQUFE6RAytrz5lBa6UUPoVL0UeMyY3qa4M6W6M="; + hash = "sha256-5SGIWiyfHvfwIUc4bhdWrlhBfK5ssA7tm5r3zKdr3kg="; }; in rec { clang = wrapCCWith rec { @@ -52,12 +52,10 @@ in rec { }; lld = callPackage ./lld.nix { - inherit llvm version; - src = "${src}/lld"; + inherit llvm src version; }; llvm = callPackage ./llvm { - inherit version; - src = "${src}/llvm"; + inherit src version; }; } diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix index 2e3e1ca13d433..272e430c1fcdf 100644 --- a/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/pkgs/development/compilers/llvm/rocm/lld.nix @@ -3,6 +3,7 @@ , cmake , libxml2 , llvm +, ninja , version , src @@ -11,15 +12,17 @@ stdenv.mkDerivation rec { inherit version src; + sourceRoot = "${src.name}/lld"; + pname = "lld"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ libxml2 llvm ]; outputs = [ "out" "dev" ]; - cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ]; + cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${src}/llvm" ]; postInstall = '' moveToOutput include "$dev" diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 722ca1a762a8d..80a387b3650d8 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -28,6 +28,8 @@ in stdenv.mkDerivation rec { pname = "rocm-llvm"; + sourceRoot = "${src.name}/llvm"; + outputs = [ "out" "python" ] ++ lib.optional enableSharedLibraries "lib"; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4b0e6e618e3ad..f7250885f14c8 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -183,6 +183,14 @@ in { install -Dt $out/bin src/nimble runHook postBuild ''; + + meta = with lib; { + description = "Package manager for the Nim programming language"; + homepage = "https://github.com/nim-lang/nimble"; + license = licenses.bsd3; + maintainers = with maintainers; [ ehmry ]; + mainProgram = "nimble"; + }; }; nim = let diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 77606d8a51158..751afe8556c5a 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-04-29"; + version = "unstable-2022-05-04"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "520d9d7025b46b926123257b029b3dbce9a96065"; - sha256 = "aACkkTzOH8F82GPyySjtb7CGozR8OjgzqZVRiNTiS10="; + rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5"; + sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y="; }; postPatch = '' diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 1a74a78fc6c46..0dc085d032b31 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 8f2b6d4054622..addaa13270d92 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 7fb1c35cf9f57..37ff998337844 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 29a5c3cc5c312..d4e88f278cd04 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 987d018cdf378..e692de71a10dd 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 0a4a8e1de4131..3e9ae98f36629 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -154,7 +154,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index de12711894f77..45acc7f1ce985 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -157,7 +157,7 @@ let disallowedReferences = [ openjdk17-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index d8c1bb6bf254d..1ca2901b048dd 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index d491d75322f44..b8f6b2d62ad4f 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 98e6fc6216e23..2720a887565c3 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -75,7 +75,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index aeb60d8bc4607..3048c53f10f2d 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -90,7 +90,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix index abe469af69150..f07a7f38a45b9 100644 --- a/pkgs/development/compilers/openjdk/darwin/meta.nix +++ b/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -1,4 +1,4 @@ -lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // { +lib: version: (removeAttrs (import ../meta.nix lib version) [ "maintainers" ]) // { platforms = lib.platforms.darwin; homepage = "https://www.azul.com/"; } diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index d635d5c01e6b6..c66ecc29cf519 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -1,8 +1,11 @@ -lib: with lib; { +lib: version: with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; mainProgram = "java"; + knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" ]) [ + "This OpenJDK version has reached its end of life." + ]; } diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 0dff7f0e1b094..3ae837ac46ba8 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -4,27 +4,34 @@ , pkg-config , lit , llvm_11 +, spirv-headers +, spirv-tools }: stdenv.mkDerivation rec { pname = "SPIRV-LLVM-Translator"; - version = "unstable-2021-06-13"; + version = "unstable-2022-05-04"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - rev = "c67e6f26a7285aa753598ef792593ac4a545adf9"; - sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4="; + rev = "99420daab98998a7e36858befac9c5ed109d4920"; + sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; }; - nativeBuildInputs = [ pkg-config cmake llvm_11.dev ]; + nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ]; - buildInputs = [ llvm_11 ]; + buildInputs = [ spirv-headers llvm_11 ]; checkInputs = [ lit ]; + makeFlags = [ "llvm-spirv" ]; + cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" + "-DLLVM_DIR=${llvm_11.dev}" + "-DBUILD_SHARED_LIBS=YES" + "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8013f283c708d..8dc2b4c02bbf0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -100,8 +100,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.0"; - sha256 = "2SvRPFYwkF7rapg9y3AiBNqXMUYMKm5OOfhnmW83EEA="; + version = "0.56.1"; + sha256 = "xRi4Hf3agtHN9Yaz+bIyMWLLlr08taLANlDOoCXZH7k="; }; vala = vala_0_54; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 0c24e67123c62..065e4462f2efb 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; + mainProgram = "v"; platforms = platforms.all; }; } diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 56ce94ecc6f33..db3227c1770e0 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,11 +1,12 @@ { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: let recent = lib.versions.isGe "8.7" coq.coq-version; in -mkCoqDerivation { +(mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ + { cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; } @@ -16,6 +17,7 @@ mkCoqDerivation { { cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.5" pred.true ]; out = "20170512"; } ] null; + release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0"; release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw"; release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; @@ -46,4 +48,11 @@ mkCoqDerivation { description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; }; -} +}).overrideAttrs (o: + let after_1_6 = lib.versions.isGe "1.6" o.version || o.version == "dev"; + in { + nativeBuildInputs = o.nativeBuildInputs + ++ lib.optional after_1_6 coq.ocamlPackages.cppo; + propagatedBuildInputs = o.propagatedBuildInputs + ++ lib.optionals after_1_6 (with coq.ocamlPackages; [ findlib zarith ]); +}) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index ae3f7e809fb6f..7cff9ddef4b90 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "20211213"; } + { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index c50f8672e01cb..ecd154c82ed50 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.11" "8.14"; out = "8.13.0"; } + { case = range "8.11" "8.15"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index eedbe6fb5d88d..9ba5f03a5620f 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.14"; out = "0.9"; } + { case = range "8.13" "8.15"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index af535993362a6..4993a76b4f08f 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -6,9 +6,13 @@ mkCoqDerivation rec { owner = "fbesson"; domain = "gitlab.inria.fr"; + release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya"; + release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isEq "8.15"; out = "8.15.0"; } + { case = isEq "8.14"; out = "8.14.0"; } { case = isEq "8.13"; out = "8.13+no"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 6f82532ada30e..35e9398f3ad7a 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp-ssreflect.version ] [{ - cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0"; + cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 89567d401b22b..e112512ec5c72 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "8.14.0"; } + { case = range "8.10" "8.15"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix index 63bed38ead9c4..f03065cf04503 100644 --- a/pkgs/development/coq-modules/smpl/default.nix +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -8,10 +8,14 @@ mkCoqDerivation { release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; + release."8.14".sha256 = "sha256:0wmrc741j67ch4rkygjkrz5i9afi01diyyj69i24cmasvx4wad38"; + release."8.15".sha256 = "sha256:0m9xlkdhilvqb0v4q9c4hzfwffbccd6029ks39xg7qbiq6zklpvp"; releaseRev = v: "v${v}"; inherit version; defaultVersion = with versions; switch coq.version [ + { case = isEq "8.15"; out = "8.15"; } + { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } { case = "8.12.2"; out = "8.12"; } { case = "8.10.2"; out = "8.10.2"; } diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 416b8d1bb58c2..0389b45fb5cdd 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation { release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.13") ]; out = "itp22"; } + defaultVersion = with versions; switch coq.version [ + { case = isEq "8.13"; out = "itp22"; } ] null; propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ]; diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index f3b65167ea66c..62aa67efd774a 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -99,19 +99,22 @@ self: super: { hls-class-plugin = dontCheck super.hls-class-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; - # Similar RTS issue in test suite: - # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. - hls-hlint-plugin = dontCheck super.hls-hlint-plugin; - hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; - hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; - - # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; # We disable profiling on aarch64, so tests naturally fail ghc-prof = dontCheck super.ghc-prof; +} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && builtins.compareVersions super.ghc.version "9.2" < 0) { + # Some aarch64 issues have been fixed since 9.2 + + # Similar RTS issue in test suite: + # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. + # Fixed since 9.2 + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; + hls-rename-plugin = dontCheck super.hls-rename-plugin; + hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8393d02a31647..06b394bbe5eca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1667,19 +1667,6 @@ self: super: { lsp = assert super.lsp.version == "1.4.0.0"; dontCheck super.lsp; - hls-test-utils = assert super.hls-test-utils.version == "1.2.0.0"; appendPatches [ - (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/074593987e9086e308b89ecde336de2c64861dc0.patch"; - sha256 = "sha256-uTlIbGQKulP3963UPL2V9cqMoIvPscK+s2W/HtBmMWc="; - relative = "hls-test-utils"; - }) - (fetchpatch { - url = "https://github.com/haskell/haskell-language-server/commit/78305f21783807b04baebca4860c255bfe84d4ab.patch"; - sha256 = "sha256-oe8Q8kBJBkel+pR5imFj43NVpm4afcyLgAUCWhrIoPk="; - relative = "hls-test-utils"; - }) - ] super.hls-test-utils; - # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 hls-eval-plugin = dontCheck super.hls-eval-plugin; @@ -2321,6 +2308,10 @@ self: super: { # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205 hls-stylish-haskell-plugin = doJailbreak super.hls-stylish-haskell-plugin; + # Necesssary .txt files are not included in sdist. + # https://github.com/haskell/haskell-language-server/pull/2887 + hls-change-type-signature-plugin = dontCheck super.hls-change-type-signature-plugin; + # Too strict bounds on hspec # https://github.com/haskell-works/hw-hspec-hedgehog/issues/62 # https://github.com/haskell-works/hw-prim/issues/132 @@ -2657,4 +2648,9 @@ self: super: { sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0="; }) super.wstunnel; + # Adjustment of bounds on servant is unreleased + # https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d + servant-cassava = assert super.servant-cassava.version == "0.10.1"; + doJailbreak super.servant-cassava; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 2eea5f8c58b92..d40643114e478 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -200,6 +200,8 @@ self: super: ({ hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-floskell-plugin = dontCheck super.hls-floskell-plugin; hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; + # 2022-05-05: Tests fail and I have no way to debug them. + hls-rename-plugin = dontCheck super.hls-rename-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; @@ -289,4 +291,7 @@ self: super: ({ # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 regex-rure = dontCheck super.regex-rure; + # same + # https://hydra.nixos.org/build/174540882/nixlog/9 + jacinda = dontCheck super.jacinda; }) 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 c8e7c8179e6d3..48972849cf6aa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -43,7 +43,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { 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 5eaa1ae413d47..11c3677913ea4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,7 +42,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Needs Cabal 3.0.x. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 98eaab7073176..d7b049b205b64 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -42,7 +42,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # GHC 8.8.x can build haddock version 2.23.* haddock = self.haddock_2_23_1; 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 855afa28101d5..db38ebd8b708b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -44,7 +44,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { 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 249816cc49c4d..93fe7ab26c7eb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -44,7 +44,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # Tests fail because of typechecking changes conduit = dontCheck super.conduit; @@ -90,7 +92,7 @@ self: super: { # causing the build-depends to be skipped. Since the dependency # list hasn't changed much since 0.6.4, we can just reuse the # normal expression. - inherit (self.ghc-exactprint_1_4_1) src version; + inherit (self.ghc-exactprint_1_5_0) src version; revision = null; editedCabalFile = null; libraryHaskellDepends = [ self.fail @@ -195,17 +197,7 @@ self: super: { } super.memory); # Use hlint from git for GHC 9.2.1 support - hlint = doDistribute ( - overrideSrc { - version = "unstable-2021-12-12"; - src = pkgs.fetchFromGitHub { - owner = "ndmitchell"; - repo = "hlint"; - rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46"; - sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc"; - }; - } super.hlint - ); + hlint = self.hlint_3_4; # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; @@ -216,7 +208,7 @@ self: super: { some = doJailbreak super.some; fourmolu = super.fourmolu_0_6_0_0; # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 - hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.2.0"; doJailbreak super.hls-fourmolu-plugin; + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; @@ -226,18 +218,11 @@ self: super: { # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html haskell-language-server = overrideCabal (old: {libraryHaskellDepends = builtins.filter (x: x != super.hls-tactics-plugin) old.libraryHaskellDepends;}) (appendConfigureFlags [ - "-f-alternateNumberFormat" - "-f-class" - "-f-eval" "-f-haddockComments" - "-f-hlint" "-f-retrie" "-f-splice" "-f-tactics" ] (super.haskell-language-server.override { - hls-alternate-number-format-plugin = null; - hls-class-plugin = null; - hls-eval-plugin = null; hls-haddock-comments-plugin = null; hls-hlint-plugin = null; hls-retrie-plugin = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index bc65e209911ea..ad3aea047ae32 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,9 @@ self: super: { time = null; transformers = null; unix = null; - xhtml = null; + # GHC only bundles the xhtml library if haddock is enabled, check if this is + # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 + xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6afd1dc17d59d..509da53381d89 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -455,6 +455,7 @@ broken-packages: - bower-json - bowntz - bpath + - BPS - braid - brain-bleep - Bravo @@ -511,6 +512,7 @@ broken-packages: - bytestring-substring - bytestring-time - bytestring-typenats + - bzlib-conduit-jappie - c10k - c2ats - cab @@ -523,6 +525,7 @@ broken-packages: - cabal-constraints - cabal-db - cabal-dependency-licenses + - cabal-detailed-quickcheck - cabal-dev - cabal-dir - cabal-edit @@ -854,6 +857,7 @@ broken-packages: - CoreDump - CoreErlang - core-haskell + - core-webserver-warp - Coroutine - coroutine-object - CouchDB @@ -1236,6 +1240,7 @@ broken-packages: - ede - edenmodules - edis + - EdisonAPI - EdisonCore - edit - edit-lenses @@ -2100,6 +2105,7 @@ broken-packages: - hdo - hdph-closure - hdr-histogram + - HDRUtils - headergen - heap-console - heapsort @@ -3932,6 +3938,7 @@ broken-packages: - polysemy-mocks - polysemy-readline - polysemy-req + - polysemy-scoped-fs - polysemy-zoo - polytypeable - polyvariadic @@ -4221,6 +4228,7 @@ broken-packages: - Referees - references - refined-http-api-data + - refined-with - reflection-extras - reflex-basic-host - reflex-dom-ace @@ -4486,7 +4494,6 @@ broken-packages: - servant-auth-hmac - servant-avro - servant-benchmark - - servant-cassava - servant-client-js - servant-db - servant-dhall @@ -5269,6 +5276,7 @@ broken-packages: - typalyze - typeable-mock - typeable-th + - typecheck-plugin-nat-simple - type-combinators - typed-digits - typed-encoding @@ -5388,6 +5396,7 @@ broken-packages: - utf8-prelude - utf8-validator - UTFTConverter + - util - util-logict - util-plus - util-primitive @@ -5804,3 +5813,4 @@ broken-packages: - Zwaluw - zxcvbn-hs - zydiskell + - zyre2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b1bee72c8e2d9..a444cdcd63fe5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -121,7 +121,6 @@ extra-packages: - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - - ghc-exactprint == 1.4.* # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e0e60d509a077..64f9195673dde 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.4 +# Stackage LTS 19.5 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -78,7 +78,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.1.2.0 + - ascii ==1.1.3.0 - ascii-case ==1.0.0.10 - ascii-char ==1.0.0.14 - asciidiagram ==1.3.3.3 @@ -86,7 +86,7 @@ default-package-overrides: - ascii-numbers ==1.0.0.0 - ascii-predicates ==1.0.0.10 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.12 + - ascii-superset ==1.0.1.13 - ascii-th ==1.0.0.10 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -297,8 +297,8 @@ default-package-overrides: - cast ==0.1.0.2 - caster ==0.0.3.0 - cayley-client ==0.4.17 - - cborg ==0.2.6.0 - - cborg-json ==0.2.3.0 + - cborg ==0.2.7.0 + - cborg-json ==0.2.4.0 - cdar-mBound ==0.1.0.4 - c-enum ==0.1.1.3 - cereal ==0.5.8.2 @@ -630,7 +630,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.0 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.8.1 + - dunai ==0.8.2 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -874,7 +874,7 @@ default-package-overrides: - ghc-check ==0.5.0.6 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - - ghc-events ==0.17.0.2 + - ghc-events ==0.17.0.3 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 @@ -980,7 +980,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - happstack-server ==7.7.2 - - happstack-server-tls ==7.2.1.1 + - happstack-server-tls ==7.2.1.2 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1012,7 +1012,7 @@ default-package-overrides: - hasql-optparse-applicative ==0.3.0.8 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - - hasql-th ==0.4.0.11 + - hasql-th ==0.4.0.12 - hasql-transaction ==1.0.1.1 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 @@ -1216,6 +1216,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.1 - hw-json-simple-cursor ==0.1.1.1 - hw-json-standard-cursor ==0.2.3.2 + - hwk ==0.6 - hw-kafka-client ==4.0.3 - hw-mquery ==0.2.1.1 - hworker ==0.1.0.1 @@ -1240,7 +1241,7 @@ default-package-overrides: - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyper ==0.2.1.1 - - hyperloglog ==0.4.5 + - hyperloglog ==0.4.6 - hyphenation ==0.8.2 - iconv ==0.4.1.3 - identicon ==0.2.2 @@ -1787,7 +1788,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.3 - pcg-random ==0.1.3.7 - - pcre2 ==2.1.0.1 + - pcre2 ==2.1.1 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 @@ -2030,10 +2031,10 @@ default-package-overrides: - ref-fd ==0.5 - refined ==0.6.3 - reflection ==2.1.6 - - reform ==0.2.7.4 - - reform-blaze ==0.2.4.3 + - reform ==0.2.7.5 + - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.4 + - reform-happstack ==0.2.5.5 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 - regex ==1.1.0.1 @@ -2136,7 +2137,7 @@ default-package-overrides: - sdl2 ==2.5.3.0 - sdl2-ttf ==2.1.2 - search-algorithms ==0.3.2 - - secp256k1-haskell ==0.6.0 + - secp256k1-haskell ==0.6.1 - securemem ==0.1.10 - selda ==0.5.1.0 - selda-sqlite ==0.1.7.1 @@ -2158,7 +2159,7 @@ default-package-overrides: - sequence-formats ==1.6.6.1 - sequenceTools ==1.5.2 - serf ==0.1.1.0 - - serialise ==0.2.4.0 + - serialise ==0.2.5.0 - servant ==0.19 - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 @@ -2245,6 +2246,7 @@ default-package-overrides: - singletons-presburger ==0.6.1.0 - singletons-th ==3.0 - siphash ==1.0.3 + - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - sized ==1.0.0.0 - skein ==1.0.9.4 @@ -2382,7 +2384,7 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.2 - - swish ==0.10.1.0 + - swish ==0.10.2.0 - syb ==0.7.2.1 - sydtest-discover ==0.0.0.1 - symbol ==0.2.4 @@ -2716,7 +2718,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.8 + - wai-extra ==3.1.10 - wai-feature-flags ==0.1.0.3 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -2749,11 +2751,11 @@ default-package-overrides: - webgear-server ==1.0.1 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - - web-routes ==0.27.14.3 - - web-routes-boomerang ==0.28.4.2 - - web-routes-happstack ==0.23.12.1 - - web-routes-hsp ==0.24.6.1 - - web-routes-wai ==0.24.3.1 + - web-routes ==0.27.14.4 + - web-routes-boomerang ==0.28.4.3 + - web-routes-happstack ==0.23.12.2 + - web-routes-hsp ==0.24.6.2 + - web-routes-wai ==0.24.3.2 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 - websockets-simple ==0.2.0 @@ -2839,7 +2841,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.1 - yesod-bin ==1.6.2.1 - - yesod-core ==1.6.22.0 + - yesod-core ==1.6.23 - yesod-eventsource ==1.6.0.1 - yesod-form ==1.7.0 - yesod-form-bootstrap4 ==3.0.1 @@ -2854,7 +2856,7 @@ default-package-overrides: - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.12 + - yesod-test ==1.6.13 - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 198572573b8ff..3828a55fab432 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -436,12 +436,14 @@ dont-distribute-packages: - adp-multi-monadiccp - aeson-native - aeson-result + - affine - afv - agda-server - agda-snippets-hakyll - agentx - aip - aivika-distributed + - alg - algebra-checkers - algebra-driven-design - algebra-sql @@ -647,6 +649,7 @@ dont-distribute-packages: - apiary-websockets - apis - apotiki + - appendful-persistent - approx-rand-test - arbor-monad-metric-datadog - archive-tar-bytestring @@ -663,7 +666,7 @@ dont-distribute-packages: - ascii - ascii-cows - ascii-table - - ascii_1_2_0_0 + - ascii_1_2_2_0 - asic - asif - assert4hs-hspec @@ -770,6 +773,7 @@ dont-distribute-packages: - berp - bff - bglib + - bifunctor - billboard-parser - billeksah-forms - billeksah-main @@ -784,6 +788,7 @@ dont-distribute-packages: - bindings-ppdev - bindynamic - binembed-example + - binrep - bioace - bioalign - biofasta @@ -864,6 +869,7 @@ dont-distribute-packages: - bytelog - bytestring-builder-varword - bytestring-read + - ca - cabal-bounds - cabal-cache - cabal-cargs @@ -913,6 +919,7 @@ dont-distribute-packages: - cassy - casui - categorical-algebra + - category - category-extras - cautious-gen - cctools-workqueue @@ -1068,7 +1075,9 @@ dont-distribute-packages: - configifier - configurator-ng - conic-graphs + - constraint - constraint-manip + - constraint-reflection - constructible - consumers - container @@ -1095,6 +1104,7 @@ dont-distribute-packages: - copilot-libraries - copilot-sbv - copilot-theorem + - core-webserver-servant - coroutine-enumerator - coroutine-iteratee - couch-simple @@ -1389,6 +1399,8 @@ dont-distribute-packages: - exinst-deepseq - exinst-hashable - exinst-serialise + - exist + - exist-instances - expand - expat-enumerator - expiring-containers @@ -1404,6 +1416,7 @@ dont-distribute-packages: - extract-dependencies - factual-api - fadno + - fair - fallingblocks - family-tree - fast-arithmetic @@ -1484,6 +1497,7 @@ dont-distribute-packages: - fluent-logger - fluent-logger-conduit - fmt-for-rio + - foldable1 - follower - foo - formal @@ -1565,6 +1579,7 @@ dont-distribute-packages: - geniconvert - geniserver - genvalidity-aeson + - genvalidity-appendful - genvalidity-hspec-aeson - genvalidity-mergeful - genvalidity-mergeless @@ -2379,6 +2394,7 @@ dont-distribute-packages: - iteratee-parsec - iteratee-stm - iterio-server + - ival - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -2391,6 +2407,7 @@ dont-distribute-packages: - ivory-serialize - ivory-stdlib - ivy-web + - ix - ixset - ixset-typed-binary-instance - ixset-typed-cassava @@ -2474,6 +2491,7 @@ dont-distribute-packages: - keid-sound-openal - keid-ui-dearimgui - kevin + - key-vault - keyring - keysafe - keystore @@ -3058,7 +3076,6 @@ dont-distribute-packages: - phonetic-languages-simplified-base - phonetic-languages-simplified-common - phonetic-languages-simplified-examples-array - - phonetic-languages-simplified-examples-common - phonetic-languages-simplified-generalized-examples-array - phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-generalized-properties-array @@ -3154,6 +3171,7 @@ dont-distribute-packages: - process-streaming - procrastinating-structure - producer + - product - product-isomorphic - prof2dot - profiterole @@ -3249,9 +3267,11 @@ dont-distribute-packages: - raketka - rallod - random-access-file + - random-class - random-effin - random-hypergeometric - range-space + - ranged-list - rasa - rasa-example-config - rasa-ext-bufs @@ -3414,6 +3434,7 @@ dont-distribute-packages: - roundtrip-xml - route-generator - route-planning + - row - rpc - rpf - rsagl @@ -3602,6 +3623,7 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client + - smt - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -3936,6 +3958,7 @@ dont-distribute-packages: - twitter-conduit - twitter-enumerator - twitter-types-lens + - txt - type-assertions - type-cache - type-cereal @@ -3981,6 +4004,7 @@ dont-distribute-packages: - uniqueness-periods-vector-filters - uniqueness-periods-vector-general - uniqueness-periods-vector-properties + - universal - universe - universe-dependent-sum - universe-th @@ -4021,6 +4045,7 @@ dont-distribute-packages: - vacuum-graphviz - vacuum-opengl - vacuum-ubigraph + - valid - variable-precision - vault-tool-server - vault-trans diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 612b0a224c566..01d73c4a2a348 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1331,6 +1331,34 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "BPS" = callPackage + ({ mkDerivation, base, extra, free, mtl, resourcet, STMonadTrans + , symbol, template-haskell, TLT, transformers + }: + mkDerivation { + pname = "BPS"; + version = "0.1.0.0"; + sha256 = "0rkrjj42p9ybcifmsmz8717yyf2q3vzwm4y42khxz824vdxa9q2j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + transformers + ]; + executableHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + transformers + ]; + testHaskellDepends = [ + base extra free mtl resourcet STMonadTrans symbol template-haskell + TLT transformers + ]; + description = "Translations of classic Truth Maintenance Systems"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "Baggins" = callPackage ({ mkDerivation, base, cairo, containers, mtl }: mkDerivation { @@ -5186,9 +5214,13 @@ self: { pname = "EdisonAPI"; version = "1.3.1"; sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm"; + revision = "1"; + editedCabalFile = "1nlw49ifjvav102pigksi46xg0zwnpfj29j3db0rr76hykikpipy"; libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "EdisonCore" = callPackage @@ -8142,6 +8174,8 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) pfstools;}; "HERA" = callPackage @@ -19773,8 +19807,8 @@ self: { }: mkDerivation { pname = "TLT"; - version = "0.1.0.0"; - sha256 = "125hfd8ig706zsizyn959qsjcadsgbiqq3dnygjxambvd2d135pr"; + version = "0.1.0.1"; + sha256 = "1b91ax19dfgi50rlkfvjjywzz6w998d5jsq5c0yz620rcdl7jrki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25032,14 +25066,12 @@ self: { }) {}; "aeson-helper" = callPackage - ({ mkDerivation, aeson, base, text, unordered-containers, vector }: + ({ mkDerivation, aeson, base, text, vector }: mkDerivation { pname = "aeson-helper"; - version = "0.1.0.0"; - sha256 = "0s4gq827i2wyflcaxbhlr8f8svlw8szzmwax9d7vnxk9wy9fw8w0"; - libraryHaskellDepends = [ - aeson base text unordered-containers vector - ]; + version = "0.2.0.0"; + sha256 = "1im4grk23vkxgpa1fhhdg0ghg5j1z2qcwqvnpjk1s168993j2522"; + libraryHaskellDepends = [ aeson base text vector ]; description = "Aeson helper func"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -25350,8 +25382,8 @@ self: { ({ mkDerivation, aeson, aeson-helper, base, text }: mkDerivation { pname = "aeson-result"; - version = "0.1.0.0"; - sha256 = "10bnzh7vlh42sip0z7mvx5jxrsi7p2s3vqy55pfg2pb17czzly2y"; + version = "0.2.0.0"; + sha256 = "1sssh9k4fkmsn96m796f5j3p5a5sc8khqgjfj4pzi1r935368n1f"; libraryHaskellDepends = [ aeson aeson-helper base text ]; description = "API Result for aeson"; license = lib.licenses.bsd3; @@ -25710,6 +25742,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Affine spaces (generalized)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "affine-invariant-ensemble-mcmc" = callPackage @@ -26507,22 +26540,27 @@ self: { }) {}; "alfred-margaret" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, hashable, hspec - , hspec-expectations, primitive, QuickCheck, quickcheck-instances - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, hashable, hspec, hspec-expectations, primitive + , QuickCheck, quickcheck-instances, text, unordered-containers + , vector }: mkDerivation { pname = "alfred-margaret"; - version = "1.1.1.0"; - sha256 = "1z3plc2a6qnlx1cpb3icw44h3lbspaq2n7djl4pljhb4dm5bflbq"; + version = "1.1.2.0"; + sha256 = "02p9djplw187v4k7mi6mh6mjjs7gir0crghyxfkjqjrxk5s7f3j7"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers deepseq hashable primitive text + aeson base bytestring containers deepseq hashable primitive text unordered-containers vector ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base deepseq hspec hspec-expectations QuickCheck + base deepseq hspec hspec-expectations primitive QuickCheck quickcheck-instances text ]; + benchmarkHaskellDepends = [ base criterion deepseq vector ]; description = "Fast Aho-Corasick string searching"; license = lib.licenses.bsd3; }) {}; @@ -26533,11 +26571,12 @@ self: { pname = "alg"; version = "0.2.13.1"; sha256 = "0764j2njb86qdskck3nvbrh61v99hqdhf8aj9irblm6smdlrv4l3"; - revision = "1"; - editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v"; + revision = "2"; + editedCabalFile = "1ffcn0ahv2jl6191baik5sqsh5mb61n1g4rgkiybd1mspgsmnnwy"; libraryHaskellDepends = [ base dual util ]; description = "Algebraic structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "alga" = callPackage @@ -30788,8 +30827,8 @@ self: { }: mkDerivation { pname = "annotated-exception"; - version = "0.2.0.1"; - sha256 = "0lqr283ql82kfpd6rvznwj4p0h4176mg9xnb1wnzdxxbl9rn3xgl"; + version = "0.2.0.2"; + sha256 = "07njn6r1c3n1nblnlz5q2jrk5887vxxr2yzw4khqwayy0nmgbc7l"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -30898,6 +30937,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "ansi-terminal_0_11_3" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.11.3"; + sha256 = "0swy5alj4xvfsnjrfiwxdlgzdnggjy6lgbfwph2d7c8zyzn67mgl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, containers, exceptions, hspec, linebreak, mintty, mtl @@ -32342,6 +32395,44 @@ self: { broken = true; }) {}; + "appendful" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity + , validity-containers + }: + mkDerivation { + pname = "appendful"; + version = "0.0.0.0"; + sha256 = "1wb2abnr2k7d7bgvh3zjyg55s1236cgnz1idldpxcrib30nr01l8"; + libraryHaskellDepends = [ + aeson base containers deepseq mtl validity validity-containers + ]; + license = lib.licenses.mit; + }) {}; + + "appendful-persistent" = callPackage + ({ mkDerivation, appendful, base, containers, genvalidity + , genvalidity-appendful, genvalidity-hspec, genvalidity-persistent + , hspec, microlens, monad-logger, mtl, path, path-io, persistent + , persistent-sqlite, persistent-template, QuickCheck, text + , validity + }: + mkDerivation { + pname = "appendful-persistent"; + version = "0.0.0.0"; + sha256 = "0h0hdjkkrz8ckhs8r8n0vm983513lahi9bd89i1hyqlycrckbphl"; + libraryHaskellDepends = [ + appendful base containers microlens persistent + ]; + testHaskellDepends = [ + appendful base containers genvalidity genvalidity-appendful + genvalidity-hspec genvalidity-persistent hspec monad-logger mtl + path path-io persistent persistent-sqlite persistent-template + QuickCheck text validity + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "appendmap" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -34059,8 +34150,10 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.1.2.0"; - sha256 = "17yh71i28m1m4hnlbd6sp234kwqpgsdpn4bmv2g283vq37mkn09n"; + version = "1.1.3.0"; + sha256 = "0pzyamd64mj8sx5a43gi7yjdy5dx6k9648ihbgsri8k8srlhm0c8"; + revision = "1"; + editedCabalFile = "0lxjb940qm86i1b2i9dgyj8874y49spwmkm5ninxd5hs7g9manll"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -34071,15 +34164,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ascii_1_2_0_0" = callPackage + "ascii_1_2_2_0" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group, ascii-numbers , ascii-predicates, ascii-superset, ascii-th, base, bytestring , hedgehog, text }: mkDerivation { pname = "ascii"; - version = "1.2.0.0"; - sha256 = "1m043s6030mwz4gam83nb1dyxsbkaar6i7cdvzjfgawv9gdpwkbb"; + version = "1.2.2.0"; + sha256 = "1s6xm2b0g1jcbg8xfkhysmk4rhsx2342dd980md827rnfc5l4w80"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -34289,22 +34382,6 @@ self: { }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.12"; - sha256 = "04kp4v0m1z1sh78862qryhkq1a5jzv1hdkyyrsv2m7caqkh8rn2c"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - testHaskellDepends = [ ascii-char base hedgehog text ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_13" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, hedgehog - , text - }: - mkDerivation { - pname = "ascii-superset"; version = "1.0.1.13"; sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s"; libraryHaskellDepends = [ @@ -34313,7 +34390,6 @@ self: { testHaskellDepends = [ ascii-char base hedgehog text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -36342,27 +36418,25 @@ self: { , http-types, language-bash, megaparsec, network-uri , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions + , typed-process, unix, versions }: mkDerivation { pname = "aura"; - version = "3.2.7"; - sha256 = "07ya2vd94grh6fs7k5kq25yh95xfk5mdqcgqq84anjz0phprq5z3"; - revision = "1"; - editedCabalFile = "16z28nkj5ladbbrg2h5sc1qcl3335g3i37x02h0by8bpqbkld6xr"; + version = "3.2.8"; + sha256 = "1frvim9asp0849g7f5c1hcjkr82c9w27im479vmk6n4zzssvzach"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson algebraic-graphs aur base bytestring containers filepath hashable http-client http-types language-bash megaparsec network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions + stm text time transformers typed-process unix versions ]; executableHaskellDepends = [ aeson aur base bytestring containers http-client http-client-tls megaparsec optparse-applicative prettyprinter prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions + typed-process unix versions ]; testHaskellDepends = [ base bytestring containers megaparsec rio tasty tasty-hunit text @@ -36523,8 +36597,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.0.1.0"; - sha256 = "0g0k1c76nfkw8l5x6isz6fkci9bjn67qdpmjksf4qdfla28v35ha"; + version = "0.0.1.1"; + sha256 = "12wvqn2hqfi4fh4w53qs137x5cdbqwvlksbncnbcnzdlad7ncfqa"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -36561,8 +36635,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.0"; - sha256 = "0qk1fjb47whpbnj2w776sk5mnb1m4z1dq6fmxhvjih3xsrpjq7s3"; + version = "0.1.0.1"; + sha256 = "1nzwbj3r5gps2lnriig38h1y51m4pd997z65kpsmxzcbyakdxjnd"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -36596,8 +36670,8 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.1.0.0"; - sha256 = "1wa51mas9jxzhig651i9r21fxahk8rdwg7waxx4ilayzdfhaic4b"; + version = "0.1.0.1"; + sha256 = "1js3w0r7nrvl70vkkwblx8zqax22idblpdzs1ljr4x0jiwwji8bs"; libraryHaskellDepends = [ autodocodec autodocodec-schema base bytestring containers path path-io safe-coloured-text scientific text unordered-containers @@ -38839,10 +38913,8 @@ self: { ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.9"; - sha256 = "1brikm7qr2yi3426vgwjjxjrvw060sb0v7jbxrhazjps28f6aa3n"; - revision = "1"; - editedCabalFile = "0iij1y72q28wvj8hfx000cpckl1wlcgj050380lx526cmwavy151"; + version = "0.1.10"; + sha256 = "0h16ywwf6dgazwnsqxl82l28vjx51gmh2xn8idlvc7kkl8ylgq54"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -40546,8 +40618,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.3"; - sha256 = "0qakz6fidvhg121j442lsvcz9va0xa0rks41qj293mnrs8savv0p"; + version = "0.13.4"; + sha256 = "1c2w0ll84mrzkwg3314pnmasgaql0yjhrb5wy7zlm18s3bgpcysb"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -41297,6 +41369,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Bifunctors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bifunctors" = callPackage @@ -43054,6 +43127,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "binrep" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, refined + , refined-with, text + }: + mkDerivation { + pname = "binrep"; + version = "0.1.0"; + sha256 = "10b65qdk4h96q44bl6ic8c4v2lfkr3vsm15zpia0dlikxnibvb8i"; + libraryHaskellDepends = [ + aeson base bytestring cereal refined refined-with text + ]; + description = "Encode binary representations via types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bins" = callPackage ({ mkDerivation, base, containers, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions @@ -49597,6 +49686,35 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit-jappie" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit-jappie"; + version = "0.3.0.3"; + sha256 = "10fvvcv205r45yk02fi4cyqq1r7f98hl5p4psfr3xixlzsyh6n8k"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + libraryPkgconfigDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + description = "Streaming compression/decompression via conduits"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -49840,6 +49958,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Cellular Automata"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ca-patterns" = callPackage @@ -50170,6 +50289,19 @@ self: { broken = true; }) {}; + "cabal-detailed-quickcheck" = callPackage + ({ mkDerivation, base, Cabal, QuickCheck }: + mkDerivation { + pname = "cabal-detailed-quickcheck"; + version = "0.1.1.3"; + sha256 = "1zy2b86ns5jhrl6z6qw6g1zq5nv3lpf4askpr40l9gid61h6mr01"; + libraryHaskellDepends = [ base Cabal QuickCheck ]; + description = "QuickCheck for Cabal tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cabal-dev" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers , directory, filepath, HTTP, mtl, network, pretty, process, setenv @@ -51998,6 +52130,27 @@ self: { license = lib.licenses.mit; }) {}; + "calligraphy" = callPackage + ({ mkDerivation, array, base, containers, directory, enummapset + , filepath, ghc, hspec, HUnit, mtl, optparse-applicative, process + , QuickCheck, text + }: + mkDerivation { + pname = "calligraphy"; + version = "0.1.2"; + sha256 = "08kiqp1z60hbfxm5s2d0hdr516gbq8fqyz0ddlr3vk0g9npm3nj2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers directory enummapset filepath ghc mtl + optparse-applicative process text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base containers hspec HUnit QuickCheck ]; + description = "HIE-based Haskell call graph and source code visualizer"; + license = lib.licenses.bsd3; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, fgl, filepath, flint, fortran-src @@ -53708,9 +53861,12 @@ self: { pname = "category"; version = "0.2.5.0"; sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7"; + revision = "1"; + editedCabalFile = "13yj1v414llr5cxdd5f3wdy75si2hj7f3k1f6w7kwj84gbrii5rr"; libraryHaskellDepends = [ alg base dual transformers ]; description = "Categorical types and classes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "category-extras" = callPackage @@ -53980,10 +54136,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.6.0"; - sha256 = "1mvsavi8ngsvmcvlmaygsnygf7hn8kdqdhfff91n1zajgpz577h6"; - revision = "1"; - editedCabalFile = "0ry5p8cnmm772m3z074azh1ldxvq851dmffsp2b7vljjhzd9j4sc"; + version = "0.2.7.0"; + sha256 = "076656vq2qabhdnwzifc5gsj20vwh69vhy19dh0qa1f2lqxrzfvq"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -54004,8 +54158,8 @@ self: { }: mkDerivation { pname = "cborg-json"; - version = "0.2.3.0"; - sha256 = "1nsind3yiix6mb3xgwcnb267d8w9k0dvfnj78jc58gybx5hl9n53"; + version = "0.2.4.0"; + sha256 = "1h5i8sf1q1xr4c2y945vanj6n1wkkag1vflfjys7ygbgddbcq7rv"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -54039,8 +54193,8 @@ self: { pname = "cci"; version = "0.3.1"; sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7"; - revision = "1"; - editedCabalFile = "11s00cbbimpglashmp1vmw1xhd4y2g1spn01ajvx3sw6wdyh614n"; + revision = "2"; + editedCabalFile = "123jmn7lgz1hmkygjzqckffm77783pfzddnjyvvv7rsnpgl4ckqn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -57365,8 +57519,8 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.2.2"; - sha256 = "10gj6764qhdy6ki0dyy75ycpj5il26jgxxjcr0xy9kkixi3wgsrb"; + version = "0.3.0"; + sha256 = "1iprssnpxykh9fjgckjnh5qlmnf1drgzjjfcq9fxyqs755y38vbi"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -57673,8 +57827,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.28.0"; - sha256 = "11cr4mql6jhskhk1hg2c7kkvv005bha7y9b3ccpgy1147grnp00m"; + version = "0.28.0.1"; + sha256 = "1h18gh6042qq7qphiqdj9ww9k2pghj3dzz33rdh6w4jlx967w6bw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -57847,8 +58001,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.25"; - sha256 = "0ii9984y7792i7kiwnqmgn9mfyky2k9dkx3fnzkirypqbxyri92s"; + version = "0.4.3.26"; + sha256 = "1h348cgxrvj6p4kd4vzfkdjvx592p7yb16mmxp27k61jvncg1vjw"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -57872,8 +58026,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-redirect"; - version = "0.0.1.2"; - sha256 = "1vb0knjy0qkbpzni10bgvznnjxc7bv7pbp1l9frdffdsrssgyx8w"; + version = "0.0.1.3"; + sha256 = "15qcqrrznx7wz0anfwvs0rr3jl51ifcb0gxlr236c4c4xx8wfhna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57894,8 +58048,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.3.2"; - sha256 = "0ag94kc0csjnh88vw6ljifv6cqqwc8wizyizqk0mj4qpp73z6qd2"; + version = "0.4.3.5"; + sha256 = "07gms8mcp4lbi6fqxanzg2z7ybjhisxaal7yix3039glh54d2gv3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -64877,6 +65031,7 @@ self: { libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -64911,6 +65066,7 @@ self: { libraryHaskellDepends = [ base category constraint reflection ]; description = "Constraint reflection"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "constraint-tuples" = callPackage @@ -65272,14 +65428,14 @@ self: { }) {}; "context" = callPackage - ({ mkDerivation, async, base, containers, ghc-prim, hspec - , hspec-discover + ({ mkDerivation, async, base, containers, exceptions, ghc-prim + , hspec, hspec-discover }: mkDerivation { pname = "context"; - version = "0.1.1.1"; - sha256 = "0zn8hnyf04q7brchll3xnk0ifxadl050wric191irmnl29m6p5k8"; - libraryHaskellDepends = [ base containers ]; + version = "0.2.0.0"; + sha256 = "1s915v2wbmhwp3qwk5p7n1iz510wfdmi4nq2zg1m04q7dpzhl0xz"; + libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-indexed, nested contexts"; @@ -65339,8 +65495,8 @@ self: { }: mkDerivation { pname = "context-http-client"; - version = "0.1.0.0"; - sha256 = "0ad917jnzqd2idzh6a5j9nvjf2pg7l968vmn38cxgh9hfq3yhwm7"; + version = "0.2.0.0"; + sha256 = "0d7hdqcvfay8m1inbl19z4hj8qqi2a00qsxh7n7s03075rd8wzs0"; libraryHaskellDepends = [ base context http-client ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -65352,12 +65508,14 @@ self: { }) {}; "context-resource" = callPackage - ({ mkDerivation, async, base, context, hspec, hspec-discover }: + ({ mkDerivation, async, base, context, exceptions, hspec + , hspec-discover + }: mkDerivation { pname = "context-resource"; - version = "0.1.0.0"; - sha256 = "0695m9hnx8grfmyy7mzd6n3426qc18sh14hy6glhr5nwj9c4k4c2"; - libraryHaskellDepends = [ base context ]; + version = "0.2.0.0"; + sha256 = "0jjy6i6vcg3b9chrkw7l2yza8kdxl8d4bdlrqp0anpaxwm1q34da"; + libraryHaskellDepends = [ base context exceptions ]; testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; description = "Thread-safe, pool-compatible resource provider"; @@ -65385,8 +65543,8 @@ self: { }: mkDerivation { pname = "context-wai-middleware"; - version = "0.1.0.0"; - sha256 = "0bisqsngccddkamf60qyk4h9w4w80ppks51i4p9bl39kmf7hd65l"; + version = "0.2.0.0"; + sha256 = "017zwjq4kl3jjmrdp0x6zxbsd9k5xnvcgf4r1cjk7cnlch36cwmn"; libraryHaskellDepends = [ base context wai ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -66384,6 +66542,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.2.2"; + sha256 = "000ffh2lrv5yl9gybx3i8gp66f1vd1w6mhih8bipxf7fzgsn6pik"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -66422,6 +66598,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_4_6_1" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , typed-process, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.4.6.1"; + sha256 = "0vjrffccnh7vl86mfm7i4rfwk9pzsg47g0gd4pg6fsdcs6118amq"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams @@ -66441,6 +66639,26 @@ self: { license = lib.licenses.mit; }) {}; + "core-telemetry_0_2_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-program, core-text, exceptions, http-streams, io-streams + , mtl, network-info, random, safe-exceptions, scientific, stm + , template-haskell, text, unix + }: + mkDerivation { + pname = "core-telemetry"; + version = "0.2.0.1"; + sha256 = "1l302ncnv1w3p84v16acxvkyr6kvrr6385i7qdrmqi0a8yfwizb0"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-program + core-text exceptions http-streams io-streams mtl network-info + random safe-exceptions scientific stm template-haskell text unix + ]; + description = "Advanced telemetry"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -66458,6 +66676,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_7_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.7.1"; + sha256 = "11l89p9fn05l8h7dx6mpw4mhwhcxhdl2879lj628bxjal3f2fys3"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-warn" = callPackage ({ mkDerivation, base, containers, containers-good-graph, ghc, syb }: @@ -66488,6 +66724,7 @@ self: { ]; description = "Interoperability with Servant"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "core-webserver-warp" = callPackage @@ -66497,14 +66734,16 @@ self: { }: mkDerivation { pname = "core-webserver-warp"; - version = "0.1.1.0"; - sha256 = "0yfd2037bq6vljixkhrk2v2mlywj2br16pf5dpz2vahjpk0079yj"; + version = "0.1.1.3"; + sha256 = "1yjy5y0lvwkjyribhqavcda57s30jc7xjacng2g3p256kfp7mc2r"; libraryHaskellDepends = [ async base bytestring core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault wai warp ]; description = "Interoperability with Wai/Warp"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "corebot-bliki" = callPackage @@ -66763,6 +67002,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "countable_1_2" = callPackage + ({ mkDerivation, base, bytestring, silently, tasty, tasty-golden + , tasty-hunit + }: + mkDerivation { + pname = "countable"; + version = "1.2"; + sha256 = "119v5ms4nyxikfwlmz71qk9gqp53zkpyxc6wm3qp5bm9b6n1ff47"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring silently tasty tasty-golden tasty-hunit + ]; + description = "Countable, Searchable, Finite, Empty classes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "countable-inflections" = callPackage ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-utils , QuickCheck, regex-pcre-builtin, text @@ -67221,8 +67477,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "4.0.3"; - sha256 = "1b6bqhg3rf2kk7i81l4vsgyp7zxiycifdrsj8qa4sqx78m72dmxh"; + version = "4.0.4"; + sha256 = "04s947r9wsqamqx3sq0h41l0mwxcw7pqc11jlrj8r94wgiikpkh2"; libraryHaskellDepends = [ base bytestring cereal containers Decimal iproute network template-haskell text time transformers uuid vector @@ -69519,6 +69775,24 @@ self: { broken = true; }) {}; + "csv-sip" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, hspec, text + , transformers + }: + mkDerivation { + pname = "csv-sip"; + version = "0.1.0"; + sha256 = "1m33kw4rgzq7ivhr44giagp0b2xx0h9q0ipidll8xrrklvxzkcsc"; + libraryHaskellDepends = [ + base bytestring conduit containers text transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers hspec text transformers + ]; + description = "extracts data from a CSV file"; + license = lib.licenses.gpl3Plus; + }) {}; + "csv-table" = callPackage ({ mkDerivation, base, containers, csv, filepath, process }: mkDerivation { @@ -76028,6 +76302,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "derivingvia-extras" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "derivingvia-extras"; + version = "0.1.0.0"; + sha256 = "11fsx8pbxqp968pgvms6qzw5x871r3c94m812nz81fpqkm6mv5cz"; + libraryHaskellDepends = [ base hashable ]; + description = "DerivingVia extras - Miscellaneous /via/ types"; + license = lib.licenses.bsd3; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -77132,6 +77417,26 @@ self: { broken = true; }) {}; + "dhall-text-shell" = callPackage + ({ mkDerivation, base, containers, dhall, filepath + , optparse-applicative, process, text + }: + mkDerivation { + pname = "dhall-text-shell"; + version = "0.2.0.0"; + sha256 = "10i1i7fk9y5hsxjjb87jbfnprg7nkrvpax6kd4blfphpzs2mpz5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dhall filepath optparse-applicative process text + ]; + executableHaskellDepends = [ + base containers dhall filepath optparse-applicative process text + ]; + description = "Render dhall text with shell commands as function arguments"; + license = lib.licenses.mit; + }) {}; + "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant , dhall, Diff, directory, filepath, microlens, optparse-applicative @@ -77396,6 +77701,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "diagnose" = callPackage + ({ mkDerivation, base, data-default, hashable, prettyprinter + , prettyprinter-ansi-terminal, unordered-containers, wcwidth + }: + mkDerivation { + pname = "diagnose"; + version = "1.8.2"; + sha256 = "11hyd08aixx795mf79ybzkz59s68v59rdl6lkyjvzn06sh1fvvdc"; + libraryHaskellDepends = [ + base data-default hashable prettyprinter + prettyprinter-ansi-terminal unordered-containers wcwidth + ]; + testHaskellDepends = [ + base data-default hashable prettyprinter + prettyprinter-ansi-terminal unordered-containers wcwidth + ]; + description = "Beautiful error reporting done easily"; + license = lib.licenses.bsd3; + }) {}; + "diagrams" = callPackage ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib , diagrams-svg @@ -83602,8 +83927,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.8.1"; - sha256 = "1zijhrk50cyyrb6jqlf8q0hh87lbfy5k9iy6w2az66nm89ckxrv9"; + version = "0.8.2"; + sha256 = "1hcjzd6zki10lkh6f11naxqrnkdmiqm4hwyj5acj4naqkakc6mmp"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -83633,8 +83958,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.8.1"; - sha256 = "1iy989wz4jnn9g892p7n0f1hj2hd61a01vxnqz5fr0yppbsckp3h"; + version = "0.8.2"; + sha256 = "0cicvzp604945mmlnrxwkkcyl01id933jrnnrv3y0c5xqlly2y9r"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -90357,6 +90682,23 @@ self: { license = lib.licenses.mit; }) {}; + "exact-pi_0_5_0_2" = callPackage + ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "exact-pi"; + version = "0.5.0.2"; + sha256 = "1xmc3vlzfccrn5szglnxx13akxw2xacgl40kqh0kiw82d58x47a4"; + libraryHaskellDepends = [ base numtype-dk ]; + testHaskellDepends = [ + base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "exact-real" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, checkers, criterion , doctest, groups, integer-gmp, QuickCheck, random, tasty @@ -90431,6 +90773,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "exception-hierarchy_0_1_0_7" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "exception-hierarchy"; + version = "0.1.0.7"; + sha256 = "14kk0rync05rq2adx5lk59y56h97s0yv7mqfn2grhhwqb10maqj0"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Exception type hierarchy with TemplateHaskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "exception-mailer" = callPackage ({ mkDerivation, base, hslogger, mime-mail, text }: mkDerivation { @@ -90960,6 +91314,7 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols util ]; description = "Dependent sum type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "exist-instances" = callPackage @@ -90975,6 +91330,7 @@ self: { ]; description = "Instances for \"exist\" package (requires more language extensions and dependencies)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "existential" = callPackage @@ -91803,6 +92159,23 @@ self: { license = lib.licenses.mit; }) {}; + "extensioneer" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, hpack, mtl + , optparse-applicative, yaml + }: + mkDerivation { + pname = "extensioneer"; + version = "0.1.0.0"; + sha256 = "02n7ajra4vx63wjjj4dj54md87hk0cjz61bh6m3ql37h97iqsiqx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory hpack mtl optparse-applicative yaml + ]; + description = "Inspect extensions in cabal and hpack files"; + license = lib.licenses.mit; + }) {}; + "extensions" = callPackage ({ mkDerivation, base, bytestring, Cabal, colourista, containers , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog @@ -92258,6 +92631,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Lists with fair choice"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fair-predicates" = callPackage @@ -93145,8 +93519,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "2.1.1"; - sha256 = "0j2rckrv1aksfp2wyiyffqg40jl927vs97fk2lyzkscz673jd9s9"; + version = "2.1.1.1"; + sha256 = "18hqmhfzniydmxwi8b21iz04pc6x8hdy8pj6960ihrk20ddkih3d"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra cryptonite data-default http-client http-conduit http-types memory @@ -93217,8 +93591,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.0.0"; - sha256 = "1j5whbx72q7jvjkv952y8qmgqkm19dprn6p1glvgsck8nhmffkkd"; + version = "1.1"; + sha256 = "11vhm176dm2i4zy7ipg20rsmp7rdabq8gh29byflqxm5s5wp86y6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93313,16 +93687,20 @@ self: { }) {}; "fcf-containers" = callPackage - ({ mkDerivation, base, doctest, first-class-families, Glob }: + ({ mkDerivation, base, doctest, first-class-families, ghc-prim + , Glob, mtl + }: mkDerivation { pname = "fcf-containers"; - version = "0.6.0"; - sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp"; + version = "0.7.0"; + sha256 = "0ai2hmcva84z29jxr3inngnicx0wn05vnh9lw460fcfckdfxf5xf"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base first-class-families ]; + libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; executableHaskellDepends = [ base first-class-families ]; - testHaskellDepends = [ base doctest first-class-families Glob ]; + testHaskellDepends = [ + base doctest first-class-families ghc-prim Glob + ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -97605,6 +97983,7 @@ self: { libraryHaskellDepends = [ base transformers util ]; description = "Foldable types with at least 1 element"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "foldl" = callPackage @@ -103836,8 +104215,8 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "1.0.0.0"; - sha256 = "1k28vl7i2idv44962wspvhpqpfznj52ckd3g7h580894vghhwi89"; + version = "1.0.0.1"; + sha256 = "0j5sms6f3ivxn981gzqsyhks2q2fws8xdbnnffb209dr0afg00b1"; libraryHaskellDepends = [ aeson base genvalidity genvalidity-scientific genvalidity-text genvalidity-unordered-containers genvalidity-vector QuickCheck @@ -103854,6 +104233,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "genvalidity-appendful" = callPackage + ({ mkDerivation, appendful, base, containers, criterion + , genvalidity, genvalidity-containers, genvalidity-criterion + , genvalidity-hspec, genvalidity-hspec-aeson, genvalidity-time + , genvalidity-uuid, hspec, mtl, pretty-show, QuickCheck, random + , time, uuid + }: + mkDerivation { + pname = "genvalidity-appendful"; + version = "0.0.0.0"; + sha256 = "0sri0xdaqxpaapjspq4gipmvh7az3dilbzd4v5ihgcsjfk7kxmaj"; + libraryHaskellDepends = [ + appendful base containers genvalidity genvalidity-containers + genvalidity-time QuickCheck + ]; + testHaskellDepends = [ + appendful base containers genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec mtl pretty-show QuickCheck random time uuid + ]; + benchmarkHaskellDepends = [ + appendful base criterion genvalidity-criterion + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-bytestring" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck @@ -103879,6 +104284,29 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck + , validity-case-insensitive + }: + mkDerivation { + pname = "genvalidity-case-insensitive"; + version = "0.0.0.0"; + sha256 = "1lmg44ihas98h02121bv1wy59k0za65nsgb64nh0al5bs6m7vsrl"; + libraryHaskellDepends = [ + base case-insensitive genvalidity validity-case-insensitive + ]; + testHaskellDepends = [ + base case-insensitive genvalidity-hspec hspec + ]; + benchmarkHaskellDepends = [ + base case-insensitive criterion genvalidity genvalidity-criterion + QuickCheck + ]; + description = "GenValidity support for case-insensitive"; + license = lib.licenses.mit; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-property @@ -105304,25 +105732,6 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.17.0.2"; - sha256 = "0dkzxpfiqpd1i1lhrssp1b242111228ap113iavarr9hb7y8rl72"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-events_0_17_0_3" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; version = "0.17.0.3"; sha256 = "0m50x2ycv43d7yzwksbs1zc11wlyiszjz662fj47v9r7hacx335v"; isLibrary = true; @@ -105334,7 +105743,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -105412,21 +105820,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-exactprint_1_4_1" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "ghc-exactprint"; - version = "1.4.1"; - sha256 = "0q9z43753arxbcs6mz26kz4dsz0c2i5hkxa125gl36vsipxfrq92"; - revision = "1"; - editedCabalFile = "00wvn8j7439r5pp9wjqasv710amrsf34qpa3czxja2khg9jdnngj"; - isLibrary = true; - isExecutable = true; - description = "ExactPrint for GHC"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "ghc-exactprint_1_5_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -105442,6 +105835,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-gc-hook" = callPackage + ({ mkDerivation, base, clock }: + mkDerivation { + pname = "ghc-gc-hook"; + version = "0.2.0.0"; + sha256 = "0k7w7imrlg2gdcibkm6b02phk163xv4lnsab316jcfdid53zi7j2"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base clock ]; + description = "GHC garbage collection hook"; + license = lib.licenses.bsd3; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -105474,6 +105879,8 @@ self: { pname = "ghc-heap"; version = "9.2.1"; sha256 = "10d7p12p9v5z426rxx1cyhk90hx6ab6l98bk1v4a9gk551fcqsv9"; + revision = "1"; + editedCabalFile = "11kwkc96vk0jd7lpm0bz5x2ji4qc222wm2lc3y4lfx0knir2kyi6"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -106716,15 +107123,16 @@ self: { ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, case-insensitive , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, exceptions, extra - , filepath, fingertree, focus, fuzzy, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api - , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens - , list-t, lsp, lsp-test, lsp-types, monoid-subclasses, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck + , dependent-sum, Diff, directory, dlist, enummapset, exceptions + , extra, filepath, fingertree, focus, fuzzy, ghc, ghc-boot + , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, list-t, lsp, lsp-test, lsp-types + , monoid-subclasses, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, random, record-dot-preprocessor , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple @@ -106735,15 +107143,17 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.6.0.1"; - sha256 = "14k1x54kk27yaaw8n0iq1kq1hl4j417bgbvdiy0a6zg6h7rdnwzw"; + version = "1.7.0.0"; + sha256 = "097vpp1gds36ijldz29bsk71pxc82l966ka578cxsrcdc3g3ll1b"; + revision = "1"; + editedCabalFile = "0xvszq1jad6126vg73qys8z9jys7b1gs75fsaa4kq5dnrfg8hpx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async base base16-bytestring binary bytestring case-insensitive containers cryptohash-sha1 data-default - deepseq dependent-map dependent-sum Diff directory dlist exceptions - extra filepath fingertree focus fuzzy ghc ghc-boot ghc-boot-th + deepseq dependent-map dependent-sum Diff directory dlist enummapset + exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t @@ -106763,13 +107173,14 @@ self: { ]; testHaskellDepends = [ aeson async base binary bytestring containers data-default - directory extra filepath ghc ghc-typelits-knownnat haddock-library - hls-graph hls-plugin-api lens list-t lsp lsp-test lsp-types - network-uri optparse-applicative process QuickCheck - quickcheck-instances random record-dot-preprocessor record-hasfield - regex-tdfa rope-utf16-splay safe safe-exceptions shake - sqlite-simple stm stm-containers tasty tasty-expected-failure - tasty-hunit tasty-quickcheck tasty-rerun text unordered-containers + directory extra filepath fuzzy ghc ghc-typelits-knownnat + haddock-library hls-graph hls-plugin-api lens list-t lsp lsp-test + lsp-types monoid-subclasses network-uri optparse-applicative + parallel process QuickCheck quickcheck-instances random + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake sqlite-simple stm stm-containers tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text unordered-containers vector ]; testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ @@ -109337,6 +109748,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "github_0_28" = callPackage + ({ mkDerivation, aeson, base, base-compat, base16-bytestring + , binary, binary-instances, bytestring, containers, cryptohash-sha1 + , deepseq, deepseq-generics, exceptions, file-embed, hashable + , hspec, hspec-discover, http-client, http-client-tls + , http-link-header, http-types, iso8601-time, mtl, network-uri + , tagged, text, time-compat, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "github"; + version = "0.28"; + sha256 = "142l0zff852606hkpvkhvagp6h3ziq2z2x7x2pa77q5ymyq48089"; + libraryHaskellDepends = [ + aeson base base-compat base16-bytestring binary binary-instances + bytestring containers cryptohash-sha1 deepseq deepseq-generics + exceptions hashable http-client http-client-tls http-link-header + http-types iso8601-time mtl network-uri tagged text time-compat tls + transformers transformers-compat unordered-containers vector + vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bytestring file-embed hspec tagged text + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Access to the GitHub API, v3"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, mtl, network @@ -114082,8 +114524,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.5.0"; - sha256 = "09hj57r77r9mx2dy830n9qv3ap2nsg8a94gmpzf69zddqvk1fhm8"; + version = "0.6.5.1"; + sha256 = "06sasqagh4xa6gkhgjxf7jpvwfp9q27r0qnpr7rq0dxwsbrpqgnp"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -114654,13 +115096,13 @@ self: { ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, checkers , containers, criterion, deepseq, doctest, input-parsers , markdown-unlit, monoid-subclasses, parsers, QuickCheck - , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat - , text, transformers, witherable + , rank2classes, tasty, tasty-quickcheck, text, transformers + , witherable }: mkDerivation { pname = "grammatical-parsers"; - version = "0.5.2"; - sha256 = "1xnm5j0lznabscpswzvxjccwxb6c8js7jg3z1ddd60gffq69wpip"; + version = "0.6"; + sha256 = "1ck7zv110yrwz04q10j38wx6ipap88np9px6l94rxbha1m1k7nhi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -114673,8 +115115,7 @@ self: { ]; testHaskellDepends = [ base checkers containers doctest monoid-subclasses parsers - QuickCheck rank2classes size-based tasty tasty-quickcheck - testing-feat witherable + QuickCheck rank2classes tasty tasty-quickcheck witherable ]; testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ @@ -118492,6 +118933,37 @@ self: { broken = true; }) {}; + "hackage-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, http-io-streams, io-streams + , microlens, microlens-mtl, microlens-th, mtl, netrc + , optparse-applicative, pretty, process-extras, semigroups + , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time + , unordered-containers, zlib + }: + mkDerivation { + pname = "hackage-cli"; + version = "0.0.3.6"; + sha256 = "1wnh3571mgwyl9c5bfkwvr4rvsnw41qb9mlz1nda1ya53qfdjl4p"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers mtl pretty + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + http-io-streams io-streams microlens microlens-mtl microlens-th mtl + netrc optparse-applicative process-extras semigroups stringsearch + tagsoup tar text time unordered-containers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal filepath tasty tasty-golden + ]; + doHaddock = false; + description = "CLI tool for Hackage"; + license = lib.licenses.gpl3Plus; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -121137,8 +121609,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.6.0"; - sha256 = "0sqldnhfp631vb3v69zm856zax89mgykvj4f9siisqn41qz097zx"; + version = "2.6.1"; + sha256 = "1kyh4l3c4xf6ykjmjvza44d0mf69wpwgi7v88g7lh3ag26m455w3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -121311,8 +121783,8 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.9.1"; - sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn"; + version = "0.5.9.3"; + sha256 = "1qm6kk5p5j7gvr6ckjibls5pid3qqihv9csd50q5yb1vzdqv1pii"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base @@ -121385,8 +121857,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.5"; - sha256 = "1krjas0id8an3ry83xrgxl9cb18n17r394ivz05c45mwan6sbpqf"; + version = "7.3.7.6"; + sha256 = "1y23yzppvxjhmvaq9yl02v8mp6ww91jpsvqfhpzxkw1jccz54bcq"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -121439,8 +121911,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12.3"; - sha256 = "1phhy9sq7hiz3c50k5wyclrsjqacw8mcdyg80h3xi43zgjmff23w"; + version = "7.0.12.4"; + sha256 = "1zqfivzwq6wfwfgds5icy5rs5vrxiw9w1wzxn5jlqn7zkz3svbl9"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -121454,8 +121926,8 @@ self: { ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { pname = "happstack-lite"; - version = "7.3.7"; - sha256 = "12vyyjl0n9dqp8mh5279930rnbwaxxlzw34651sa7h9gir9hv1zv"; + version = "7.3.8"; + sha256 = "0bvcgacsngpj92ldb2fd7yj67im0bn4jnd5a1ldpbk43w85f91pk"; libraryHaskellDepends = [ base bytestring happstack-server mtl text ]; @@ -121533,8 +122005,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1.1"; - sha256 = "0bply7dxz2046h0v0ydkicjvl491k0llapf2shxjqnskjjr5rqnk"; + version = "7.2.1.2"; + sha256 = "1qij3hx3y54s3vvcs7z656144cbp94aigy84ywfyp8238f4p5yq5"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -123742,51 +124214,52 @@ self: { , cryptohash-sha1, data-default, deepseq, directory, extra , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin - , hls-call-hierarchy-plugin, hls-class-plugin, hls-eval-plugin - , hls-explicit-imports-plugin, hls-floskell-plugin - , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin - , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin - , hls-plugin-api, hls-pragmas-plugin - , hls-qualify-imported-names-plugin, hls-refine-imports-plugin - , hls-retrie-plugin, hls-selection-range-plugin, hls-splice-plugin - , hls-test-utils, hslogger, hspec-expectations, lens, lens-aeson - , lsp, lsp-test, lsp-types, mtl, optparse-applicative - , optparse-simple, process, regex-tdfa, safe-exceptions - , sqlite-simple, stm, temporary, text, transformers - , unordered-containers + , hls-call-hierarchy-plugin, hls-change-type-signature-plugin + , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin + , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph + , hls-haddock-comments-plugin, hls-hlint-plugin + , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api + , hls-pragmas-plugin, hls-qualify-imported-names-plugin + , hls-refine-imports-plugin, hls-rename-plugin, hls-retrie-plugin + , hls-selection-range-plugin, hls-splice-plugin, hls-test-utils + , hspec-expectations, lens, lens-aeson, lsp, lsp-test, lsp-types + , mtl, optparse-applicative, optparse-simple, prettyprinter + , process, regex-tdfa, safe-exceptions, sqlite-simple, stm + , temporary, text, transformers, unix, unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.6.1.1"; - sha256 = "03z650zk7ma0gsmb7mirzarwg0535kwmwyf0h8a89s8bqfcd5mxf"; + version = "1.7.0.0"; + sha256 = "1p5dr5j7vl86a4ig6y6cxf7rk8lswxsdxq9029sydghnyl3kaf3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - githash hie-bios hiedb hls-graph hls-plugin-api hslogger lsp - optparse-applicative optparse-simple process safe-exceptions - sqlite-simple text unordered-containers + githash hie-bios hiedb hls-graph hls-plugin-api lsp + optparse-applicative optparse-simple prettyprinter process + safe-exceptions sqlite-simple text unordered-containers ]; executableHaskellDepends = [ aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb hls-alternate-number-format-plugin hls-call-hierarchy-plugin - hls-class-plugin hls-eval-plugin hls-explicit-imports-plugin - hls-floskell-plugin hls-fourmolu-plugin hls-graph - hls-haddock-comments-plugin hls-hlint-plugin hls-module-name-plugin - hls-ormolu-plugin hls-plugin-api hls-pragmas-plugin - hls-qualify-imported-names-plugin hls-refine-imports-plugin - hls-retrie-plugin hls-selection-range-plugin hls-splice-plugin - hslogger lens lsp mtl optparse-applicative optparse-simple process + hls-change-type-signature-plugin hls-class-plugin hls-eval-plugin + hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin + hls-graph hls-haddock-comments-plugin hls-hlint-plugin + hls-module-name-plugin hls-ormolu-plugin hls-plugin-api + hls-pragmas-plugin hls-qualify-imported-names-plugin + hls-refine-imports-plugin hls-rename-plugin hls-retrie-plugin + hls-selection-range-plugin hls-splice-plugin lens lsp mtl + optparse-applicative optparse-simple prettyprinter process regex-tdfa safe-exceptions sqlite-simple stm temporary text - transformers unordered-containers + transformers unix unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath ghcide hls-plugin-api hls-test-utils hspec-expectations - lens lens-aeson lsp-test lsp-types process text + lens lens-aeson lsp-test lsp-types prettyprinter process text unordered-containers ]; testToolDepends = [ ghcide ]; @@ -127414,8 +127887,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.11"; - sha256 = "1dkx0r874qzn2kb8wimr1n75vmx70jx5ddi8088dlw5cxhj2v950"; + version = "0.4.0.12"; + sha256 = "0fcfm2d66f7hzzc9s73dd9dxcjsrr33c1q0v04j3zqm159kk69jd"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -127425,15 +127898,15 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-th_0_4_0_12" = callPackage + "hasql-th_0_4_0_14" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant, foldl , hasql, postgresql-syntax, template-haskell , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.12"; - sha256 = "0fcfm2d66f7hzzc9s73dd9dxcjsrr33c1q0v04j3zqm159kk69jd"; + version = "0.4.0.14"; + sha256 = "0zskfsvxzilz6j3cd09hl6ixn3j9daksqjcb73pfm1f9hhrasa2a"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -127484,8 +127957,8 @@ self: { }: mkDerivation { pname = "hasql-url"; - version = "0.1.0.0"; - sha256 = "12zsw4jag27g0bgxm9sp45bs2i7p5h42zs5avj01zlddpyhla0wx"; + version = "0.2.0.0"; + sha256 = "1f8vc7s031f33rkbzlmqac3h1g6aynj9z03x4lx19526q2d2r7ns"; libraryHaskellDepends = [ base bytestring hasql network-uri split ]; @@ -130362,26 +130835,27 @@ self: { }) {}; "helic" = callPackage - ({ mkDerivation, aeson, base, chronos, containers, exon, gi-gdk - , gi-glib, gi-gtk, hostname, http-client, http-client-tls, incipit - , optparse-applicative, path, path-io, polysemy, polysemy-chronos - , polysemy-conc, polysemy-http, polysemy-log, polysemy-plugin - , polysemy-process, polysemy-test, polysemy-time, servant - , servant-client, servant-client-core, servant-server, table-layout - , tasty, template-haskell, terminal-size, torsor, transformers - , typed-process, unix, wai-extra, warp, yaml + ({ mkDerivation, aeson, base, chronos, containers, exon + , fast-logger, gi-gdk, gi-glib, gi-gtk, hostname, http-client + , http-client-tls, incipit, optparse-applicative, path, path-io + , polysemy, polysemy-chronos, polysemy-conc, polysemy-http + , polysemy-log, polysemy-plugin, polysemy-process, polysemy-test + , polysemy-time, servant, servant-client, servant-client-core + , servant-server, table-layout, tasty, template-haskell + , terminal-size, torsor, transformers, typed-process, unix + , wai-extra, warp, yaml }: mkDerivation { pname = "helic"; - version = "0.5.1.0"; - sha256 = "1gglcac10abszarmrgggrirf51jj0qcbp7gdqh93kghx1pqv4ldg"; + version = "0.5.2.0"; + sha256 = "0yklds711iya00fmp9l1kdyipdm8mrfssabqf8g7f55p1nnmn91g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base chronos exon gi-gdk gi-glib gi-gtk hostname http-client - http-client-tls incipit optparse-applicative path path-io polysemy - polysemy-chronos polysemy-conc polysemy-http polysemy-log - polysemy-plugin polysemy-process polysemy-time servant + aeson base chronos exon fast-logger gi-gdk gi-glib gi-gtk hostname + http-client http-client-tls incipit optparse-applicative path + path-io polysemy polysemy-chronos polysemy-conc polysemy-http + polysemy-log polysemy-plugin polysemy-process polysemy-time servant servant-client servant-client-core servant-server table-layout template-haskell terminal-size transformers typed-process unix wai-extra warp yaml @@ -132972,6 +133446,8 @@ self: { pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; + revision = "1"; + editedCabalFile = "1ayy7xjbwfbdln1bqk9lpv2afc8kbzxyz9858gfafdd08kx0xmw1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135287,6 +135763,33 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "hlint_3_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, file-embed + , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex + , hscolour, process, refact, text, transformers, uniplate + , unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "3.4"; + sha256 = "15cfvch0yrzkl7qr87966amdsy05a7axvjc6wmw99ys9d5fn3z3n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra file-embed filepath filepattern + ghc-lib-parser ghc-lib-parser-ex hscolour process refact text + transformers uniplate unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ base ]; + description = "Source code suggestions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "hlint-test" = callPackage ({ mkDerivation, base, hlint }: mkDerivation { @@ -135425,8 +135928,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "1.0.1.0"; - sha256 = "1xr4rizv1k6dx32mnny55s33cngmvy0a52sswpk17fl4zx3bd0pp"; + version = "1.1.0.0"; + sha256 = "1s81p2jnln8v8ny13cf26d9925lfcyhs5di5xbh3p9645ngdiy9h"; libraryHaskellDepends = [ aeson base containers ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -135447,8 +135950,8 @@ self: { }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.2.0"; - sha256 = "0vxlhggmbrfmf81qgpxmrpsflmi32hafhy21dxain1as5hrnxw8g"; + version = "1.0.2.1"; + sha256 = "0f86iymcinbad9cpghi7965xhv4ky6kq4jqsn7nndq2jklwgrw7i"; libraryHaskellDepends = [ base brittany czipwith extra filepath ghc-boot-th ghc-exactprint ghcide hls-plugin-api lens lsp-types text transformers @@ -135465,8 +135968,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.0.2.0"; - sha256 = "0772kxdp6ww91a1b0c8lfxjlpvwr8smcf8ayvaxazw76hisxrrj5"; + version = "1.0.3.0"; + sha256 = "0yfl75d2ddkzrz3p1pn8spra0qssqazsqklan46zmagrv69yg5iv"; libraryHaskellDepends = [ aeson base bytestring containers extra ghc ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -135479,6 +135982,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-change-type-signature-plugin" = callPackage + ({ mkDerivation, base, filepath, ghcide, hls-plugin-api + , hls-test-utils, lsp, lsp-types, QuickCheck, regex-tdfa, syb, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-change-type-signature-plugin"; + version = "1.0.1.0"; + sha256 = "0wl4vgml491gkvzmsfj3nlwx18ywvrdwgwdkqjp0rwid0pidd6z8"; + libraryHaskellDepends = [ + base ghcide hls-plugin-api lsp-types regex-tdfa syb text + transformers unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lsp QuickCheck regex-tdfa text + ]; + description = "Change a declarations type signature with a Code Action"; + license = lib.licenses.asl20; + }) {}; + "hls-class-plugin" = callPackage ({ mkDerivation, aeson, base, containers, filepath, ghc , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp @@ -135486,10 +136009,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.2.0"; - sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0"; - revision = "1"; - editedCabalFile = "18x8k0gwpxv0vs4d8rbl5p0pjf75apb142i0p8vssbpvjwiwx33i"; + version = "1.0.3.0"; + sha256 = "0ad7ypw7d8waz3nq9p6m8l91rcibd2fzxxmdrpncwshiyrhazq3l"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -135507,23 +136028,22 @@ self: { , ghc-paths, ghcide, hashable, hls-graph, hls-plugin-api , hls-test-utils, lens, lsp, lsp-types, megaparsec, mtl , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , temporary, text, time, transformers, unliftio - , unordered-containers + , text, time, transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.2.1.0"; - sha256 = "18xjq664b8aj199gd1sswa7gndwikch77v3p1c36yshfa0rviwi8"; + version = "1.2.2.0"; + sha256 = "17si94yzxz19hcddn57wf0npxc9m9vzb08b2gph7pkbxprsksb6g"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph hls-plugin-api lens lsp lsp-types megaparsec mtl parser-combinators - pretty-simple QuickCheck safe-exceptions temporary text time - transformers unliftio unordered-containers + pretty-simple QuickCheck safe-exceptions text time transformers + unliftio unordered-containers ]; testHaskellDepends = [ - aeson base directory extra filepath hls-test-utils lens lsp-types - text + aeson base containers directory extra filepath hls-plugin-api + hls-test-utils lens lsp-types text ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -135555,8 +136075,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.2.0"; - sha256 = "04v6sgzsjqk4qj586qzvfvq405z0zpc08xljxb12glmqghvi5xjg"; + version = "1.1.0.0"; + sha256 = "1r5cy59xk35d6smnrka42hxfa012h45nvsmlr1a1kbyac8ywzf6m"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -135572,8 +136092,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.1.0"; - sha256 = "1slzv2c5lzxprh8yhfk8iabmmlhh3sx97m393nrnwrjcbpzq0vai"; + version = "1.0.1.1"; + sha256 = "01c8xwfdgx5g5ipb366q0smjisyq1dfjz7scjfg5p3lyn0v555wb"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -135583,18 +136103,23 @@ self: { }) {}; "hls-fourmolu-plugin" = callPackage - ({ mkDerivation, base, filepath, fourmolu, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, text + ({ mkDerivation, aeson, base, containers, filepath, fourmolu, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, process-extras, text }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.2.0"; - sha256 = "0n9yk539wc046i6sx68gsbrc4jfmp1nsm2nir00q4sdcf7flcvff"; + version = "1.0.3.0"; + sha256 = "103rndxbmv72ghbh685766498j9rqnmgdwsrswk5nrf7afwd9x8w"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens - lsp text + lsp process-extras text + ]; + testHaskellDepends = [ + aeson base containers filepath hls-plugin-api hls-test-utils + lsp-test ]; - testHaskellDepends = [ base filepath hls-test-utils lsp-test ]; + testToolDepends = [ fourmolu ]; description = "Integration with the Fourmolu code formatter"; license = lib.licenses.asl20; }) {}; @@ -135602,19 +136127,25 @@ self: { "hls-graph" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , deepseq, directory, exceptions, extra, filepath, focus, hashable - , js-dgtable, js-flot, js-jquery, list-t, primitive, stm - , stm-containers, time, transformers, unordered-containers + , hspec, hspec-discover, js-dgtable, js-flot, js-jquery, list-t + , primitive, stm, stm-containers, tasty, tasty-hspec, tasty-hunit + , tasty-rerun, text, time, transformers, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.6.0.0"; - sha256 = "0raz4gkfhxzbmg5rf65yp5p0i3mpd0rlraz90gwbvf5l1z9jlqml"; + version = "1.7.0.0"; + sha256 = "1mq1pvn5z8fnlsj9iqck05shm8fak9zf05mbcbrxb5jvq0a31ypd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions extra filepath focus hashable js-dgtable js-flot js-jquery list-t primitive stm stm-containers time transformers unordered-containers ]; + testHaskellDepends = [ + base containers directory extra filepath hspec stm stm-containers + tasty tasty-hspec tasty-hunit tasty-rerun text + ]; + testToolDepends = [ hspec-discover ]; description = "Haskell Language Server internal graph API"; license = lib.licenses.asl20; }) {}; @@ -135628,6 +136159,8 @@ self: { pname = "hls-haddock-comments-plugin"; version = "1.0.1.0"; sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r"; + revision = "1"; + editedCabalFile = "004pi0hl1mf5njvadc45bkgahi97xdpf6pfafq1np5059ccyfd8d"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers @@ -135642,18 +136175,18 @@ self: { , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghc-lib-parser-ex, ghcide , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens - , lsp, lsp-types, regex-tdfa, stm, temporary, text, transformers - , unordered-containers + , lsp, lsp-types, refact, regex-tdfa, stm, temporary, text + , transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.3.0"; - sha256 = "0vzgsh6x8bjgi3l6nc9kfgbczxnd7fws5bmglac5khr0z042babb"; + version = "1.0.4.0"; + sha256 = "089pa1fg4ygc39a70g6x1ma1fci6jrkypg7hsmq4gf3h2rwiyvwy"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger - lens lsp regex-tdfa stm temporary text transformers + lens lsp refact regex-tdfa stm temporary text transformers unordered-containers ]; testHaskellDepends = [ @@ -135671,8 +136204,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.1.0"; - sha256 = "108p9j01d2s14akbwgwmpwb2a5r5d14vqzy6lw8n5cymgfdlza4a"; + version = "1.0.2.0"; + sha256 = "09548l8vmfq2y83agsr12w0x82drhmwa4bxpwby0mf466f4hj8da"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -135689,8 +136222,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.2.0"; - sha256 = "1jbh16z4yzl3lx9q7pcrkfrmip6rifif3rirfn7dvyj1q7cf1fk4"; + version = "1.0.2.1"; + sha256 = "1if4gahvdayx1ar4wxi4mk074zxpx6wzkwdd64fnri4k5xb15sa7"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -135703,18 +136236,17 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable - , hls-graph, hslogger, lens, lens-aeson, lsp, lsp-types - , opentelemetry, optparse-applicative, process, regex-tdfa, tasty - , tasty-hunit, tasty-rerun, text, transformers, unix - , unordered-containers + , hls-graph, lens, lens-aeson, lsp, lsp-types, opentelemetry + , optparse-applicative, process, regex-tdfa, tasty, tasty-hunit + , tasty-rerun, text, transformers, unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.3.0.0"; - sha256 = "0dkpamqgw2icx6zns79cpzsnsr33qg0i3ix66hvcl5fhhp363g9m"; + version = "1.4.0.0"; + sha256 = "0yk2y6qw88vhww8z10d2kgn57wsarfnp6z1gmjl1ik2w96a8g3mv"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist extra ghc hashable hls-graph hslogger lens lens-aeson lsp + dlist extra ghc hashable hls-graph lens lens-aeson lsp opentelemetry optparse-applicative process regex-tdfa text transformers unix unordered-containers ]; @@ -135732,8 +136264,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.2.0"; - sha256 = "0bmifvjhcvwhivnx6s971nidjdb2ichphp70pahx72ai24ffqqx9"; + version = "1.0.2.1"; + sha256 = "11l79214wz21v7plqf2wb6ac8bgw74fhql1p5cvkv8gr80hpb4jk"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -135754,6 +136286,8 @@ self: { pname = "hls-qualify-imported-names-plugin"; version = "1.0.1.0"; sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; + revision = "1"; + editedCabalFile = "0pb9fgpbv24726n250rkb33gx3f3xcaxmv1qqh12q4sz181qn4mb"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lsp text transformers unordered-containers @@ -135770,8 +136304,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.1.0"; - sha256 = "10q5yjpny5aah245ivazqn2h05ak428qc9arpzlg5ks2n4n293lf"; + version = "1.0.2.0"; + sha256 = "01hgz66dm6rpk7fp6b2byzvnaan3snvimkicl67c6qxla9dpxcjn"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -135783,19 +136317,23 @@ self: { }) {}; "hls-rename-plugin" = callPackage - ({ mkDerivation, base, containers, extra, filepath, ghc - , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-test-utils - , lsp, lsp-types, syb, text, transformers + ({ mkDerivation, aeson, base, containers, extra, filepath, ghc + , ghc-exactprint, ghcide, hashable, hiedb, hls-plugin-api + , hls-test-utils, lsp, lsp-types, mod, syb, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.0.1"; - sha256 = "04l2w3x60ayxa9a6cdmscrfvyx9fsnbl4q05m8f0s1s18zlgjf86"; + version = "1.0.0.2"; + sha256 = "1cqcyyh4ywxwl2wppdacp2y6hpbl5534vq8xw2ih489qczcg6s78"; libraryHaskellDepends = [ - base containers extra ghc ghc-exactprint ghcide hiedb - hls-plugin-api lsp lsp-types syb text transformers + base containers extra ghc ghc-exactprint ghcide hashable hiedb + hls-plugin-api lsp lsp-types mod syb text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base containers filepath hls-plugin-api hls-test-utils ]; - testHaskellDepends = [ base filepath hls-test-utils ]; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -135808,8 +136346,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.2.0"; - sha256 = "0w41di7rqy8xrcaavzlfhai73yw0whmnyqxhyfjwx93y1sy1l6zg"; + version = "1.0.2.1"; + sha256 = "1vl7kdw8sm9r5q35lnihq0r98wd2s3mm76c7wp0cwd55qdkaf7qv"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm @@ -135828,6 +136366,8 @@ self: { pname = "hls-selection-range-plugin"; version = "1.0.0.0"; sha256 = "1pfgxz7nyqr8gaxxv7nc0d4rpfc4rbgdkafy1fpgcsbkqx9llkn0"; + revision = "1"; + editedCabalFile = "1njq2p1z9z5gy0fxgbp81q4syqw3hx1b5151g93qhhla9d0cr7nv"; libraryHaskellDepends = [ aeson base containers extra ghcide hls-plugin-api lsp mtl semigroupoids text transformers @@ -135850,6 +136390,8 @@ self: { pname = "hls-splice-plugin"; version = "1.0.1.0"; sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc"; + revision = "1"; + editedCabalFile = "15hr2vc1r4zxf4z26byax95cdqhl1733fna16lifrdj15xkwxs3r"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie syb text transformers unliftio-core @@ -135867,8 +136409,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.1.0"; - sha256 = "1f9g113xrb167cpdjifd2zp8ps1w2apvkghdiagc9rzw1fl0l7l4"; + version = "1.0.1.1"; + sha256 = "1k9bv31226zgy5aqxzzj7npph2ff0r5bx692q5n26lpil2ivq6sn"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -135890,8 +136432,8 @@ self: { }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.6.1.0"; - sha256 = "15ynxlafrs0hss5qcn4aj8iip8iy631hfgqql0irqskvf3x5yxlx"; + version = "1.6.2.0"; + sha256 = "07qh9sz3rbqflfryxaj7y8vjmv388jdsmaxvz5z0xfq895yk968p"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -135912,20 +136454,19 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, blaze-markup, bytestring , containers, data-default, directory, extra, filepath, ghcide - , hls-graph, hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test - , lsp-types, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-rerun, temporary, text, unordered-containers + , hls-graph, hls-plugin-api, lens, lsp, lsp-test, lsp-types, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun + , temporary, text, unordered-containers }: mkDerivation { pname = "hls-test-utils"; - version = "1.2.0.0"; - sha256 = "1y3g101n7z78f5shfqfklg5zgl8gpkic0dwvpr5072dq1vvpfdvf"; + version = "1.3.0.0"; + sha256 = "1qm3lna4jy658bmbr6gpjq2gmcz03rdz535gilxycbjkxl2z3hkq"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default - directory extra filepath ghcide hls-graph hls-plugin-api hspec - hspec-core lens lsp lsp-test lsp-types tasty tasty-expected-failure - tasty-golden tasty-hunit tasty-rerun temporary text - unordered-containers + directory extra filepath ghcide hls-graph hls-plugin-api lens lsp + lsp-test lsp-types tasty tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text unordered-containers ]; description = "Utilities used in the tests of Haskell Language Server"; license = lib.licenses.asl20; @@ -138743,6 +139284,45 @@ self: { license = lib.licenses.mit; }) {}; + "hpack_0_35_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.35.0"; + sha256 = "1cii4bdn4rm2l3yw9vsv4ygn61zmalaa282iqg9rihys90nvrgf6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -138806,7 +139386,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hpack-dhall_0_5_5" = callPackage + "hpack-dhall_0_5_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal , dhall, dhall-json, Diff, directory, filepath, hpack, megaparsec , microlens, optparse-applicative, prettyprinter, tasty @@ -138814,8 +139394,8 @@ self: { }: mkDerivation { pname = "hpack-dhall"; - version = "0.5.5"; - sha256 = "1256vqqncgir0ir7i0vnvr7v5jkyx5ggng8gyi4qsqs8lmqn11r3"; + version = "0.5.7"; + sha256 = "1hwq3painl4ix7pldkzi5a8zakh9f67kcyabfbdky8b49dc5703r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140417,8 +140997,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.3"; - sha256 = "0hrlz77p5w57ax4jml5c415qb1bfh8zi357xvnb0bin7g5a00fn8"; + version = "0.0.3.4"; + sha256 = "0qg5kaybxax632nbj6qjrn02j1c954kpw5xv3yqsysdqqcqxw6bg"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -140560,8 +141140,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-wai"; - version = "0.0.1.2"; - sha256 = "1yxy49cacldbic67ic35ym48zd0c1cwx1cjh6l0fxn26yvjp1i68"; + version = "0.0.1.3"; + sha256 = "1dczyw9w9pahrrj0q2qcnkx7kc46k7gqrrpbspdc0rc09idk33jx"; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api http-types iproute network text vault wai @@ -145507,8 +146087,8 @@ self: { ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }: mkDerivation { pname = "hsx-jmacro"; - version = "7.3.8.1"; - sha256 = "0ndgy5vf5rwgwqya75ny5vbr7hfqwjrdgfgpwf5410bk0603v47i"; + version = "7.3.8.2"; + sha256 = "0zb6mjky88qn918vaqbwjszjb6zczb4kqpnw3p222z44if3xpzsq"; libraryHaskellDepends = [ base hsp jmacro mtl text wl-pprint-text ]; @@ -150684,24 +151264,6 @@ self: { }) {}; "hyperloglog" = callPackage - ({ mkDerivation, approximate, base, binary, bits, bytes, cereal - , cereal-vector, comonad, deepseq, distributive, hashable, lens - , reflection, semigroupoids, semigroups, siphash, tagged, vector - }: - mkDerivation { - pname = "hyperloglog"; - version = "0.4.5"; - sha256 = "0v2zw0p104gbydj6hp2cxa2s4b85pq4srcspr582aqj38bs7spfz"; - libraryHaskellDepends = [ - approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable lens reflection semigroupoids - semigroups siphash tagged vector - ]; - description = "An approximate streaming (constant space) unique object counter"; - license = lib.licenses.bsd3; - }) {}; - - "hyperloglog_0_4_6" = callPackage ({ mkDerivation, approximate, base, binary, bits, bytes, bytestring , cereal, cereal-vector, comonad, cpu, deepseq, distributive , hashable, lens, reflection, semigroupoids, semigroups, tagged @@ -150718,7 +151280,6 @@ self: { ]; description = "An approximate streaming (constant space) unique object counter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -152813,8 +153374,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.6"; - sha256 = "1j2q1mqxfgcb8r6388xanmp5i1sdh6w52s08nd94g5lpg93mjz2q"; + version = "0.1.2.7"; + sha256 = "0yb457n26455kbq6kv8g48q66pmmaxcpikmpg9gm00sd6adgq6gl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155745,8 +156306,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "3"; - editedCabalFile = "02k9halblgnynlm781ahc81yxla8z7cck1gikm8555v78rf5hv7x"; + revision = "5"; + editedCabalFile = "073aciql0czvpaiwh9mpljcd1j2a8p5ka5awsw1j3dh7bdyg2mp7"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -155898,6 +156459,8 @@ self: { pname = "ip"; version = "1.7.4"; sha256 = "1hvqgah86z2saizhjpq2352x2ncxjsshvzj66bmij3yk6y107yfs"; + revision = "1"; + editedCabalFile = "09yrwzklzbfvh5x4j7k4vx7a49kndfz9d8kjkfvwi3frqzhr209m"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -157254,6 +157817,7 @@ self: { ]; description = "Intervals"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ivar-simple" = callPackage @@ -157547,6 +158111,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Indexed monads"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ix-shapable" = callPackage @@ -157596,8 +158161,8 @@ self: { }: mkDerivation { pname = "ixset"; - version = "1.1.1.1"; - sha256 = "1d3h53sq8i8azzr71yi4h5zma2bb2f623gpfw25x2kd4slhpkrgf"; + version = "1.1.1.2"; + sha256 = "15dgh9lgjqgn0483p98q21ym1mrwi5h7ygdjxf48aap1d20x6swp"; libraryHaskellDepends = [ base containers safecopy syb syb-with-class template-haskell ]; @@ -158515,8 +159080,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.17"; - sha256 = "14vmnaqr3lhcj7y5rj4jgm2w89kkznfksy53pinmc1xq1bd8b7px"; + version = "0.6.17.1"; + sha256 = "17z39w888nrq0jfzi74z1wnswzmcyi2x6h2p2nnmhyjsgvpjkcxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162562,8 +163127,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.8.4"; - sha256 = "10p8hc1jfzkg3s8shazkip95i6r5a8gyiz6m1khl7myvb05i21gc"; + version = "1.9"; + sha256 = "00mgh6447p0gsvm7agy1i9a874afirirx2a7qdqnbw1m14j3mzfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162658,6 +163223,7 @@ self: { ]; description = "Store of values of arbitrary types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "keycloak-hs" = callPackage @@ -163373,8 +163939,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.8.2"; - sha256 = "0hhpw8v09alicymbndl6lpflasmzchrf8zg1l4gqd8j9sj2rrzqg"; + version = "0.8.3"; + sha256 = "17xd1755yr2acf6brwbxn3yzbndv982s7jgxbj9dmd7my6v1d9i2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -175140,15 +175706,15 @@ self: { }: mkDerivation { pname = "lsfrom"; - version = "0.1"; - sha256 = "04cv4x88r10b9zkfiy1kclq3dm79akg1p16djfad8h5x988c7bq1"; + version = "0.1.1.1"; + sha256 = "1vm80k8gsh4k7937i02wv4dk2s173c9wvgiilc1am3ddp7x7ms1h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath simple-cmd simple-cmd-args ]; testHaskellDepends = [ base directory filepath simple-cmd ]; - description = "List dir files starting from a specific name"; + description = "List directory files starting from a specific name"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -177899,8 +178465,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "3"; - editedCabalFile = "19p79gjwlpgx210zlc9625vwp6mjmnb9mvxaz1h5zmgir8dwb4lv"; + revision = "4"; + editedCabalFile = "09sr3lzgkqs59vnwsimqgv098h3hj4srr2avza3z05gfkvxqj8yw"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -177974,8 +178540,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.4"; - sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7"; + version = "0.2.5"; + sha256 = "1jqa471r7r3my32lrjcrfc35259kj7afp1jgj8jr3r62dd8ckq63"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -186573,6 +187139,44 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) glew;}; + "monomer_1_4_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , bytestring-to-vector, c2hs, containers, data-default, exceptions + , extra, formatting, glew, hspec, http-client, JuicyPixels, lens + , mtl, nanovg, OpenGLRaw, process, random, sdl2, stm, text + , text-show, time, transformers, vector, websockets, wreq, wuss + }: + mkDerivation { + pname = "monomer"; + version = "1.4.0.0"; + sha256 = "104j89l1c39yl9sqfv1nsq7c3p00v0h28kvrmym46b5w1hd86xxr"; + 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 + ]; + librarySystemDepends = [ glew ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson async attoparsec base bytestring bytestring-to-vector + containers data-default exceptions extra formatting http-client + JuicyPixels lens mtl nanovg OpenGLRaw process random sdl2 stm text + text-show time transformers vector websockets wreq wuss + ]; + 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 + ]; + description = "A GUI library for writing native Haskell applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glew;}; + "monomorphic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201718,8 +202322,8 @@ self: { }: mkDerivation { pname = "org-mode"; - version = "2.0.0"; - sha256 = "17yn9si0mxyydjgv40q6rc5nw579kswlx69ycyinhdx0q34ds7rl"; + version = "2.0.1"; + sha256 = "0g22gjy7l6c28j60vbhazgcl0da58mml307qsp4zac4j4nshv7y2"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators text time @@ -201738,8 +202342,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.1"; - sha256 = "0fkwwwrmfq22g1yak9srmlbq5yixf4kdwfapq0dyr8f3pqaglf1v"; + version = "1.6.2"; + sha256 = "0qz8s63m2l0aff23fgdn97xxswbn3ah3m4rx9snfi5cscsrzsb8h"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -206916,8 +207520,8 @@ self: { }: mkDerivation { pname = "pcf-font"; - version = "0.2.2.0"; - sha256 = "1vwqy2zkj0yb0b7hx3hrcfdcg46j67sv9l8ljik8wrm7811d0rwa"; + version = "0.2.2.1"; + sha256 = "1gzlbdyhcrf7ap6zjd0fvkfwyakvb805198hpb9a86hrs5bih9mj"; libraryHaskellDepends = [ base binary bytestring containers vector zlib ]; @@ -207056,8 +207660,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "2.1.0.1"; - sha256 = "06fj8p49whxixphncmzm0c85wzqrsmg59zbb423qnqqmcwjwy2qf"; + version = "2.1.1"; + sha256 = "07ls9vxj5l8wvrj75wvyrq6qsz7fz0pamx92ik50cpl71p76lc92"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -209099,8 +209703,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.5"; - sha256 = "0xqvaypl987br15pymky9qa1z62sfa32kmcgpvnl8zpgdjsa17nc"; + version = "0.1.0.6"; + sha256 = "1hvja9yh40nqifvy0fsamdfj3f9ps85g187c7m3hg2yqz4w8pm05"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent resource-pool resourcet template-haskell @@ -209826,8 +210430,8 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-constraints-array"; - version = "0.1.1.0"; - sha256 = "1c5n04zkfhws6ciilbkya4fyr3qc2yszmqrbb7pk3jcjnv2xp32b"; + version = "0.1.2.0"; + sha256 = "1s28pipyijz13sn6wni9v850w8c6n6rkiqmavhddfnichwp3gq55"; libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; @@ -209872,8 +210476,8 @@ self: { ({ mkDerivation, base, filters-basic, mmsyn2-array }: mkDerivation { pname = "phonetic-languages-filters-array"; - version = "0.3.0.0"; - sha256 = "0g1nyab2cagppwj75vr2fj0yd9g3hs1qdkb2grj14j13bvaqbi7p"; + version = "0.4.0.0"; + sha256 = "0rkgwf9v98vdflhkcfn7s0in8dw69rh2dcv8n9lvpjd0ccmlvil8"; libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; @@ -210041,8 +210645,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.17.1.0"; - sha256 = "00lb3h4b0yd3ra0i6g64r8vfn2cyazrqai51arfprihyj31zm9kq"; + version = "0.18.0.2"; + sha256 = "0m79iv739cakgpfbixg613fhwjnvy4nidqvfrvqgq53wn4x9pdm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210075,25 +210679,22 @@ self: { }) {}; "phonetic-languages-simplified-examples-common" = callPackage - ({ mkDerivation, base, heaps, phonetic-languages-constraints-array - , phonetic-languages-ukrainian-array - }: + ({ mkDerivation, base, heaps, phonetic-languages-ukrainian-array }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.4.4.0"; - sha256 = "1y5nrr23blxm08s62q58aq0yiifxgds9lf2wf45zz11w1z16ff1n"; + version = "0.4.6.0"; + sha256 = "13i8pq52bfmxvidvykn1hcy9yv2i8yni76mcnbmfwdbd1sy615pn"; libraryHaskellDepends = [ - base heaps phonetic-languages-constraints-array - phonetic-languages-ukrainian-array + base heaps phonetic-languages-ukrainian-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage - ({ mkDerivation, base, cli-arguments, heaps, mmsyn2-array, mmsyn3 - , parallel, phonetic-languages-constraints-array + ({ mkDerivation, base, cli-arguments, foldable-ix, heaps + , mmsyn2-array, mmsyn3, parallel + , phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics, phonetic-languages-plus @@ -210104,10 +210705,10 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.15.0.0"; - sha256 = "1rayhhyvqskxw374jrl5h92lhx0n3k3wda7vw4wkgw3kbargwm7q"; + version = "0.16.0.0"; + sha256 = "16ia1kd217hy0wpdjd60l1qdz2ivcm1n0sncp106x4dksy4xc1pv"; libraryHaskellDepends = [ - base cli-arguments heaps mmsyn2-array mmsyn3 parallel + base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array @@ -214165,20 +214766,21 @@ self: { }) {}; "polysemy-RandomFu" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, polysemy - , polysemy-plugin, polysemy-zoo, random-fu, random-source, text - , vector + ({ mkDerivation, base, hspec, hspec-discover, mtl, polysemy + , polysemy-plugin, polysemy-zoo, random, random-fu, random-source + , rvar, text, vector }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.4.1"; - sha256 = "1zw8n16dm2l8rwrf014kb9jhp3q4a719bp8p08s4fnlksqkf88vl"; + version = "0.5.0.0"; + sha256 = "0zjywc9m7y56kzxvzayq4psjz6zip1x40cpjkvw39i5p2jkycc4c"; libraryHaskellDepends = [ - base polysemy polysemy-plugin polysemy-zoo random-fu random-source + base mtl polysemy polysemy-plugin polysemy-zoo random random-fu + random-source rvar ]; testHaskellDepends = [ - base hspec polysemy polysemy-plugin polysemy-zoo random-fu - random-source text vector + base hspec mtl polysemy polysemy-plugin polysemy-zoo random + random-fu random-source text vector ]; testToolDepends = [ hspec-discover ]; description = "Experimental, RandomFu effect and interpreters for polysemy"; @@ -214234,8 +214836,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.7.0.0"; - sha256 = "0jr5wh0sxbymz4p9x2p86cm9djr8bybss747xx9c778va0vgcncg"; + version = "0.8.0.1"; + sha256 = "0l1hgv9xlax5ycp66j5asfhfi9jyfcwvd9z132pbx8dyj4ikzp8y"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix @@ -214580,19 +215182,21 @@ self: { ({ mkDerivation, base, incipit-core, path, path-io, polysemy , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test , polysemy-time, posix-pty, process, stm-chans, tasty - , typed-process, unix + , tasty-expected-failure, typed-process, unix }: mkDerivation { pname = "polysemy-process"; - version = "0.7.0.0"; - sha256 = "0g1rmii4jnffl2f4ziibw62nkgzl92wf4pvq0fvzwkm01rpm9frz"; + version = "0.8.0.1"; + sha256 = "0ayn6l2c6009wrxc4rya6dc8185wp6krdck8mbbasrlvah3in3cs"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc - polysemy-resume posix-pty process stm-chans typed-process unix + polysemy-resume polysemy-time posix-pty process stm-chans + typed-process unix ]; testHaskellDepends = [ base incipit-core polysemy polysemy-conc polysemy-plugin - polysemy-resume polysemy-test polysemy-time tasty typed-process + polysemy-resume polysemy-test polysemy-time tasty + tasty-expected-failure typed-process ]; description = "Polysemy Effects for System Processes"; license = "BSD-2-Clause-Patent"; @@ -214656,6 +215260,28 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "polysemy-scoped-fs" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, extra, path + , polysemy, polysemy-fs, polysemy-path, polysemy-plugin, text + }: + mkDerivation { + pname = "polysemy-scoped-fs"; + version = "0.1.0.0"; + sha256 = "08mj5q8rfbhyd7ns4vf696cqvm0792f5dv3x1w0ci3spl2m7nhdi"; + libraryHaskellDepends = [ + base bytestring directory doctest extra path polysemy polysemy-fs + polysemy-path polysemy-plugin text + ]; + testHaskellDepends = [ + base bytestring directory doctest extra path polysemy polysemy-fs + polysemy-path polysemy-plugin text + ]; + description = "Well-typed filesystem operation effects"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "polysemy-several" = callPackage ({ mkDerivation, base, polysemy }: mkDerivation { @@ -216626,6 +217252,30 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-syntax_0_4_1" = 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 + }: + mkDerivation { + pname = "postgresql-syntax"; + version = "0.4.1"; + sha256 = "1ls3jjgbvdy0x3110lgjd3icas187qyd31cwvi858l6ayhwf9kck"; + 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 + ]; + description = "PostgreSQL AST parsing and rendering"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: mkDerivation { @@ -217109,17 +217759,17 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.0"; - sha256 = "0gcf04naa9ai4f6v7ycakwmdz379dqrr3nl0ry1pnqck835p629a"; + version = "0.4.1"; + sha256 = "1ss88q1lndjvmy7bp2jxh7qbh6z57kl1q5zcv4kzjampajf1fjbi"; revision = "1"; - editedCabalFile = "1pf6f09kdawn17nrjn221xr40g66wa282r65521y4mdmlm6yrfd0"; + editedCabalFile = "08n8l7629ci2xksjihqwrag0gcj0cdhaj94awmybd454j4idy5c1"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text time ]; testHaskellDepends = [ - base http-client servant-client servant-client-core tasty + base http-client servant servant-client servant-client-core tasty tasty-hunit ]; description = "PowerDNS API bindings for api/v1"; @@ -219627,8 +220277,8 @@ self: { }: mkDerivation { pname = "procex"; - version = "0.3.1"; - sha256 = "16f91ic12wldf59dabdca76bdcvq5r1alf05bai060dby5qqj2qj"; + version = "0.3.2"; + sha256 = "0962i86fdlgrzrzq6sp1v5hpkp1vsrsacpnalxvsz1nc81pi14qj"; libraryHaskellDepends = [ async base bytestring containers deepseq unix utf8-string ]; @@ -219724,6 +220374,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -221661,8 +222312,8 @@ self: { }: mkDerivation { pname = "ptera-th"; - version = "0.3.0.0"; - sha256 = "0w5kr7cp0kcxh1cmqb38waxci81i9ccqn42kvhkrkzf35pnkn0m4"; + version = "0.4.0.0"; + sha256 = "00rvc6y3wnxsr3ybxd3wmywgcwsajjh0g40magnlfzkgdnih9qg2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset-th ghc-prim membership ptera @@ -221727,6 +222378,22 @@ self: { license = lib.licenses.mit; }) {}; + "ptr-poker_0_1_2_8" = callPackage + ({ mkDerivation, base, bytestring, gauge, hedgehog, numeric-limits + , rerebase, scientific, text + }: + mkDerivation { + pname = "ptr-poker"; + version = "0.1.2.8"; + sha256 = "10bbfw0jdzvds4j6qcgppn4l7xflqa2578w6sqmz807mwr563f8c"; + libraryHaskellDepends = [ base bytestring scientific text ]; + testHaskellDepends = [ hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "Pointer poking action construction and composition toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ptrdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -222330,18 +222997,18 @@ self: { , fsnotify, gitrev, Glob, happy, haskeline, hspec, hspec-discover , http-types, HUnit, language-javascript, lifted-async, lifted-base , memory, microlens, microlens-platform, monad-control - , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, process, protolude, purescript-cst - , QuickCheck, regex-base, regex-tdfa, safe, scientific, semialign - , semigroups, serialise, sourcemap, split, stm, stringsearch, syb - , text, these, time, transformers, transformers-base - , transformers-compat, unordered-containers, utf8-string, vector - , wai, wai-websockets, warp, websockets + , monad-logger, monoidal-containers, mtl, network + , optparse-applicative, parallel, parsec, pattern-arrows, process + , protolude, QuickCheck, regex-base, regex-tdfa, safe, scientific + , semialign, semigroups, serialise, sourcemap, split, stm + , stringsearch, syb, text, these, time, transformers + , transformers-base, transformers-compat, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "purescript"; - version = "0.14.9"; - sha256 = "13canh915v668ii58y880b6zgzga3qmxxiblljs9qsdpwx1q7yzd"; + version = "0.15.0"; + sha256 = "0md1rkm7w6yn45i4igwqpvb82p491ai1w1z2yiym1qyi8p08798g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222350,10 +223017,10 @@ self: { cheapskate clock containers cryptonite data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline language-javascript lifted-async lifted-base memory - microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-cst - regex-tdfa safe scientific semialign semigroups serialise sourcemap - split stm stringsearch syb text these time transformers + microlens microlens-platform monad-control monad-logger + monoidal-containers mtl parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; @@ -222365,12 +223032,12 @@ self: { directory dlist edit-distance exceptions file-embed filepath fsnotify gitrev Glob haskeline http-types language-javascript lifted-async lifted-base memory microlens microlens-platform - monad-control monad-logger mtl network optparse-applicative - parallel parsec pattern-arrows process protolude purescript-cst - regex-tdfa safe scientific semialign semigroups serialise sourcemap - split stm stringsearch syb text these time transformers + monad-control monad-logger monoidal-containers mtl network + optparse-applicative parallel parsec pattern-arrows process + protolude regex-tdfa safe scientific semialign semigroups serialise + sourcemap split stm stringsearch syb text these time transformers transformers-base transformers-compat unordered-containers - utf8-string vector wai wai-websockets warp websockets + utf8-string vector ]; executableToolDepends = [ happy ]; testHaskellDepends = [ @@ -222379,11 +223046,11 @@ self: { cheapskate clock containers cryptonite data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify Glob haskeline hspec HUnit language-javascript lifted-async lifted-base - memory microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-cst - QuickCheck regex-base regex-tdfa safe scientific semialign - semigroups serialise sourcemap split stm stringsearch syb text - these time transformers transformers-base transformers-compat + memory microlens microlens-platform monad-control monad-logger + monoidal-containers mtl parallel parsec pattern-arrows process + protolude QuickCheck regex-base regex-tdfa safe scientific + semialign semigroups serialise sourcemap split stm stringsearch syb + text these time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; testToolDepends = [ happy hspec-discover ]; @@ -225845,6 +226512,7 @@ self: { libraryHaskellDepends = [ base primitive transformers util ]; description = "Class of random value generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "random-derive" = callPackage @@ -226178,6 +226846,7 @@ self: { testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; description = "The list like structure whose length or range of length can be specified"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "rangemin" = callPackage @@ -228959,6 +229628,19 @@ self: { broken = true; }) {}; + "refined-with" = callPackage + ({ mkDerivation, aeson, base, deepseq, hashable, refined }: + mkDerivation { + pname = "refined-with"; + version = "0.3.0"; + sha256 = "1d74ax7z822xsdnajsja1h49j966s7ym2ah35bpxlikl1l2wsmnh"; + libraryHaskellDepends = [ aeson base deepseq hashable refined ]; + description = "Refinement types with an \"refinement applied\" switch"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "refinery" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, mmorph, mtl , QuickCheck @@ -229815,31 +230497,19 @@ self: { ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; - version = "0.2.7.4"; - sha256 = "0dl0jz5ibcj4vafpf0a0v52rac4nmmif69817g7qgxavc093nq82"; - libraryHaskellDepends = [ base containers mtl semigroups text ]; - description = "reform is a type-safe HTML form generation and validation library"; - license = lib.licenses.bsd3; - }) {}; - - "reform_0_2_7_5" = callPackage - ({ mkDerivation, base, containers, mtl, semigroups, text }: - mkDerivation { - pname = "reform"; version = "0.2.7.5"; sha256 = "14p98i2682dm1n4drdrvilz67wfp2lr7m8f0wlmk40q3qmhc05xb"; libraryHaskellDepends = [ base containers mtl semigroups text ]; description = "reform is a type-safe HTML form generation and validation library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reform-blaze" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.4.3"; - sha256 = "1r5j827diiqybjm75j0gmfb81q7irdc11sj714589xbb6lkz3g0i"; + version = "0.2.4.4"; + sha256 = "0cf1nimvkpag4fqs9jk17cl0h9wkpv2lcq5m1l704pznms22s7c7"; libraryHaskellDepends = [ base blaze-html blaze-markup reform text ]; @@ -229866,8 +230536,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.4"; - sha256 = "1xknj906vr0q6vrxrvna1777v7hsdg1l3r0wwnga7k1yn5hcfc76"; + version = "0.2.5.5"; + sha256 = "0knsx790vf5xvnxhfdz48gz3352z98ghy1ld7yh3rmp1apciqd35"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -230902,8 +231572,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.1.0.2"; - sha256 = "0pwljb8zdq5m47zjfbmy8827g99y2fai6ib9z2p82kkknag1mg5q"; + version = "0.1.0.3"; + sha256 = "0i49cic87jdkfalwbyry7c6f1828vd1n33nkdjmxa73w3vhjklf5"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -233210,8 +233880,8 @@ self: { }: mkDerivation { pname = "restful-snap"; - version = "0.4.1"; - sha256 = "1447hbwky8lslblq3vpm7d1zyri4apmf459fbaq3m15kkd1qsyxq"; + version = "0.4.2"; + sha256 = "0639j9dv51jra3mx9pqsb9hwrp73cw4xlc27p4hklk3xqr0fvf0p"; libraryHaskellDepends = [ base blaze-builder bytestring containers data-default digestive-functors errors heist lens map-syntax mtl old-locale @@ -233434,8 +234104,8 @@ self: { pname = "retrie"; version = "1.2.0.1"; sha256 = "1n3g9wr45xz1q2mhlj1r2709rqakczrvd7x6vxh7iapz43f69c6x"; - revision = "1"; - editedCabalFile = "0dx1gxf2c88rzd1z83lmvgpbv8xny9yz8px4cjjpnmlrah1fmmqh"; + revision = "2"; + editedCabalFile = "0h6r4jg9mnqwvlsl3s6yl2zvhkwr8pdypbzvky4kwz4zvc03j5ql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233464,8 +234134,8 @@ self: { }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.1"; - sha256 = "1v8xw37cbnz16gqmf65hgk0kvh0vgmq8sj6nh4ngz48l6i5wylv6"; + version = "0.1.2"; + sha256 = "11f15nhxp8aaim6yrzlh33dilp2zywdfikgdii44q0mszmm9q0vr"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -234461,6 +235131,35 @@ self: { license = lib.licenses.mit; }) {}; + "rio_0_1_22_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, hspec-discover, microlens + , microlens-mtl, mtl, primitive, process, QuickCheck, text, time + , typed-process, unix, unliftio, unliftio-core + , unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.22.0"; + sha256 = "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens microlens-mtl mtl primitive process text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens microlens-mtl mtl primitive process + QuickCheck text time typed-process unix unliftio unliftio-core + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A standard library for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rio-app" = callPackage ({ mkDerivation, base, optparse-simple, resourcet, rio }: mkDerivation { @@ -236042,6 +236741,7 @@ self: { doHaddock = false; description = "Row types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "row-types" = callPackage @@ -237886,15 +238586,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsodium;}; - "saltine_0_2_0_0" = callPackage + "saltine_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hashable , libsodium, profunctors, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, text }: mkDerivation { pname = "saltine"; - version = "0.2.0.0"; - sha256 = "1xgrnm6qmm0mymq3dh4mdvzi8sfssnpz06xsrw8zdpa1vl0a0gm6"; + version = "0.2.0.1"; + sha256 = "181fxlp8p0zhz58h23fxavhcbxkwhd3a3idlbhawb2rhiah6fs6f"; libraryHaskellDepends = [ base bytestring deepseq hashable profunctors text ]; @@ -238750,6 +239450,36 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_9_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process + , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers, uniplate, z3 + }: + mkDerivation { + pname = "sbv"; + version = "9.0"; + sha256 = "0r84ak8n8vqs1xbvxjzai828yr5msjyf5igf6qmn6f47m0mhf6cz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers deepseq directory filepath libBF mtl + pretty process QuickCheck random syb template-haskell text time + transformers uniplate + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hlint mtl process + QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck + ]; + testSystemDepends = [ z3 ]; + benchmarkHaskellDepends = [ + base deepseq filepath process random tasty tasty-bench time + ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -238757,8 +239487,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.0.1"; - sha256 = "1hg1sxnspyxjpj98c2h7hzf93m9acw8cjiva4wsnxl1gspln4gwb"; + version = "9.2.2"; + sha256 = "0cv2f6n32m8xaii5dpk3kz6wclxgmri1zfh09dq23s91l5asrp1v"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -240077,8 +240807,8 @@ self: { }: mkDerivation { pname = "scotty-utils"; - version = "0.1.0.0"; - sha256 = "0f77b5xmr5gwswz15i5833karfr1qvyaaiy58khd75n9awfx5jqv"; + version = "0.2.0.0"; + sha256 = "0b2r43dcgcq7azcn0l9lxml84h6w5bk09h65y1mlvccwzhwbfini"; libraryHaskellDepends = [ aeson aeson-result base http-types scotty text ]; @@ -241109,29 +241839,6 @@ self: { }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.6.0"; - sha256 = "0qq37xy61kk5h9h6zaiycjlrr1k9kjddy319qgqi0ja9vkm8msj1"; - libraryHaskellDepends = [ - base base16 bytestring cereal deepseq entropy hashable QuickCheck - string-conversions unliftio-core - ]; - libraryPkgconfigDepends = [ secp256k1 ]; - testHaskellDepends = [ - base base16 bytestring cereal deepseq entropy hashable hspec HUnit - monad-par mtl QuickCheck string-conversions unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Bindings for secp256k1"; - license = lib.licenses.mit; - }) {inherit (pkgs) secp256k1;}; - - "secp256k1-haskell_0_6_1" = callPackage - ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy - , hashable, hspec, hspec-discover, HUnit, monad-par, mtl - , QuickCheck, secp256k1, string-conversions, unliftio-core - }: - mkDerivation { - pname = "secp256k1-haskell"; version = "0.6.1"; sha256 = "0abxwmls4rvsnck7p5gpajmha2vc9fbcrr2q1alkpw8acmgfhr76"; libraryHaskellDepends = [ @@ -241146,7 +241853,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) secp256k1;}; "secp256k1-legacy" = callPackage @@ -242455,10 +243161,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.4.0"; - sha256 = "07i50rza58x8j7kw9w2mhbks41gjv6xgnlgfdb0hw2cwdmkrmjqd"; - revision = "1"; - editedCabalFile = "0rgc0sr4csmiq38sf6x1xz6cqmp30nn8837xsfwpvcfb7kh4bqy0"; + version = "0.2.5.0"; + sha256 = "08ny0bdxd591w4bx6sd16ndik0j8g3578ck6zj667rm1z3ssqqj2"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -243101,8 +243805,6 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions" = callPackage @@ -243514,8 +244216,8 @@ self: { }: mkDerivation { pname = "servant-errors"; - version = "0.1.6.0"; - sha256 = "0qap8wbchpl48aigwqgxrgb6v3d6h80fpxq319c399pwrrkzyh9v"; + version = "0.1.7.0"; + sha256 = "0g7mclwxvjw9jwxmd8nkz9a0v4jwm9nxpwlranfdm2f55pa288i1"; libraryHaskellDepends = [ aeson base base-compat bytestring http-api-data http-media http-types scientific servant string-conversions text @@ -243801,14 +244503,14 @@ self: { ({ mkDerivation, base, servant-server, text }: mkDerivation { pname = "servant-htmx"; - version = "0.1.0.1"; - sha256 = "1plqqaa3vhmwg37bai6xpi415fd772fx6rf0dr919mc79ms0zcfx"; + version = "0.1.0.2"; + sha256 = "06lcs2qv6dxlx6sj16qr426vm7rklv80d720hrw4zfdba5rsl7d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base servant-server text ]; executableHaskellDepends = [ base servant-server text ]; testHaskellDepends = [ base servant-server text ]; - description = "A library for using htmx with servant"; + description = "A library for using servant with htmx"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -246602,16 +247304,16 @@ self: { "shake-bench" = callPackage ({ mkDerivation, aeson, base, Chart, Chart-diagrams , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg - , directory, extra, filepath, lens, lens-aeson, shake, text + , directory, extra, filepath, lens, lens-aeson, mtl, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.0.3"; - sha256 = "04pngr9a1g7dr7kb0xp9k2yrbg6vqk3lfpksz6bbyydbmypix3ay"; + version = "0.1.1.0"; + sha256 = "1p2xa2kxfvzy2c188i9czr5w4jck4sxw2jb7s9dc1b5xf1a4bi01"; libraryHaskellDepends = [ aeson base Chart Chart-diagrams diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory extra filepath lens lens-aeson - shake text + mtl shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -247024,6 +247726,33 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_27" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.27"; + sha256 = "1bnl7m96x8qr2rvkfzjy01d720xb3c55l3vg0zm2lfbz3gpml1jz"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -248719,6 +249448,8 @@ self: { pname = "simple-cmd"; version = "0.2.4"; sha256 = "19kd863gm33sj01biqz94jk9cy8vb07xlqmw2m9vlh16h3phgqv1"; + revision = "1"; + editedCabalFile = "01sqxzvkkj4lvsp3kd8qjb5p2k6ylkiv4a2dc821ihapr0cf2fzj"; libraryHaskellDepends = [ base directory extra filepath process unix ]; @@ -248727,6 +249458,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_5" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hspec, process + , time, unix + }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.5"; + sha256 = "151js143l6b5rg6llvmcy1hcg80cmbp50ydrjhyfjqj32a1ygrsz"; + libraryHaskellDepends = [ + base directory extra filepath process time unix + ]; + testHaskellDepends = [ base hspec ]; + description = "Simple String-based process commands"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -249730,8 +250478,8 @@ self: { }: mkDerivation { pname = "simplexmq"; - version = "1.0.2"; - sha256 = "142jpsy8myjffx4c1iw21iv210wgnyikmr66bih4gm3xgbqniz9q"; + version = "1.1.0"; + sha256 = "1qzrc32bs4s2qn8hz6z0ni5nv89a6vakl5wzk8sa7p2b3fkrc3gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251626,14 +252374,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "smash_0_1_3" = callPackage + ({ mkDerivation, base, bifunctors, binary, deepseq, hashable, mtl + , template-haskell + }: + mkDerivation { + pname = "smash"; + version = "0.1.3"; + sha256 = "1i8a8i81xs68zrsv173q0xv0f9cmxmhkgd5k90x60kv7v5pwpqw4"; + libraryHaskellDepends = [ + base bifunctors binary deepseq hashable mtl template-haskell + ]; + description = "Combinators for Maybe types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "smash-aeson" = callPackage ({ mkDerivation, aeson, base, smash, unordered-containers }: mkDerivation { pname = "smash-aeson"; - version = "0.1.0.0"; - sha256 = "0vmazs3ypqxaw4zdywimxfzrsvidnyk5damx6fpy549ny9319rqs"; - revision = "1"; - editedCabalFile = "1y0k6gz9qlr98f543607zkx6a97fnzh3zrbi2b59rlljp0rjvdw8"; + version = "0.2.0.1"; + sha256 = "0gbqvm34afkv1v0xajz8cjw0xaih3ls4dh1ygcbybgic08y0xl85"; libraryHaskellDepends = [ aeson base smash unordered-containers ]; description = "Aeson support for the smash library"; license = lib.licenses.bsd3; @@ -251645,8 +252407,8 @@ self: { ({ mkDerivation, base, lens, smash }: mkDerivation { pname = "smash-lens"; - version = "0.1.0.1"; - sha256 = "1j7v3713aahp3vh7dswrkdfrnksi1zlw9iv9zanhb714s6anyq66"; + version = "0.1.0.3"; + sha256 = "0lzvw7349wv1fjsm4q4jwggmjx9cxsrrjydvpq3q12kj6s9p9m5k"; libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; @@ -251669,12 +252431,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "smash-microlens_0_1_0_2" = callPackage + ({ mkDerivation, base, microlens, smash }: + mkDerivation { + pname = "smash-microlens"; + version = "0.1.0.2"; + sha256 = "0rfpdaw1zs8fpw6kp5zkrhj8nmx839fp2ca0cgk14g431yl651ir"; + libraryHaskellDepends = [ base microlens smash ]; + testHaskellDepends = [ base ]; + description = "Optics for the `smash` library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "smash-optics" = callPackage ({ mkDerivation, base, optics-core, smash }: mkDerivation { pname = "smash-optics"; - version = "0.1.0.1"; - sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; + version = "0.1.0.2"; + sha256 = "0acxkswkvbcwd8mawy9w029h01g3l30rkvvy6yzkb693l8xwiiry"; libraryHaskellDepends = [ base optics-core smash ]; description = "Optics for the `smash` library using `optics-core`"; license = lib.licenses.bsd3; @@ -251884,6 +252659,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Interface to Satisfiability Modulo Theories solvers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smt-lib" = callPackage @@ -252138,14 +252914,14 @@ self: { }: mkDerivation { pname = "snack"; - version = "0.1.0.0"; - sha256 = "01h49r64mg55ii32gnd7bab4rmgp73r3gks9g35z2qgdacwijwac"; + version = "0.2.0.0"; + sha256 = "13crnza7fav388s3n8gywbjam97xqhdqh0r10dcgpm5jffi8vns2"; libraryHaskellDepends = [ base bytestring bytestring-lexing text ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion string-conversions text ]; description = "Strict ByteString Parser Combinator"; - license = lib.licenses.mit; + license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -252521,6 +253297,8 @@ self: { pname = "snap-server"; version = "1.1.2.0"; sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j"; + revision = "1"; + editedCabalFile = "0ijwp0s976cpb4nny8l7vpf5xny6k8dy2xb1rya1l2x5yzj7hlrj"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -252666,21 +253444,21 @@ self: { ({ mkDerivation, base, blaze-builder, bytestring , digestive-functors, digestive-functors-heist , digestive-functors-snap, errors, heist, lens, map-syntax - , persistent, persistent-postgresql, persistent-template, readable - , restful-snap, snap, snap-extras, snaplet-persistent, text, time - , transformers, unordered-containers, xmlhtml + , persistent, persistent-postgresql, readable, restful-snap, snap + , snap-extras, snaplet-persistent, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-actionlog"; - version = "0.3.1"; - sha256 = "1cs1spfy253zf2lxjdx2ki20ikzyj035xcxkzldxkn994amw2p7l"; + version = "0.4.0"; + sha256 = "1sg6pni9317v9g0v69b4a8rhnln6bal9iv0znz07ssgj9jg1ppp0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-builder bytestring digestive-functors digestive-functors-heist digestive-functors-snap errors heist lens - map-syntax persistent persistent-postgresql persistent-template - readable restful-snap snap snap-extras snaplet-persistent text time - transformers unordered-containers xmlhtml + map-syntax persistent persistent-postgresql readable restful-snap + snap snap-extras snaplet-persistent text time transformers + unordered-containers xmlhtml ]; description = "Generic action log snaplet for the Snap Framework"; license = lib.licenses.bsd3; @@ -259761,6 +260539,56 @@ self: { license = lib.licenses.mit; }) {}; + "store_0_7_15" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base + , monad-control, mono-traversable, nats, network, primitive + , resourcet, safe, smallcheck, store-core, syb, template-haskell + , text, th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.7.15"; + sha256 = "0ws8gck230q2wcmgbpynvppd122ag1rksjjg67wcy62dfkzdk264"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable nats network primitive + resourcet safe smallcheck store-core syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh + ]; + description = "Fast binary serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -261406,8 +262234,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.5.0"; - sha256 = "094fh3byv0bgcaccq15nqra31cw12csmyqj38hib2a2p6jnc3mq1"; + version = "0.6.0.0"; + sha256 = "0a0i95j8y49wijh2c0bpy5fwz72w0p6nh19df56g2yy7xik5h6xq"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -262282,8 +263110,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.14.1.0"; - sha256 = "1chgkxqbnrgq7w9zzx118igp08h9vfgp150akazmgimy378cadlk"; + version = "0.14.2.0"; + sha256 = "1k2ffsizpy476v3zj6j634ap62qklzv80ryyh7c3j5l2cbzfv0gi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263844,23 +264672,23 @@ self: { "swish" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time }: mkDerivation { pname = "swish"; - version = "0.10.1.0"; - sha256 = "0xy12fmmiydaqm0cng24qd7c1py1sbb4ww66w0n5w26kwgh622cc"; + version = "0.10.2.0"; + sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable intern mtl network-uri - old-locale polyparse text time + polyparse text time ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups + base containers hashable HUnit network-uri semigroups test-framework test-framework-hunit text time ]; description = "A semantic web toolkit"; @@ -264027,17 +264855,17 @@ self: { , MonadRandom, mtl, optparse-applicative, path, path-io , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm - , sydtest-discover, text, yaml + , sydtest-discover, text }: mkDerivation { pname = "sydtest"; - version = "0.9.0.0"; - sha256 = "1gp9kifyh88pjnk7vnb0p09fkcmnhy5akgfdacmrmgwcnyswx6f1"; + version = "0.10.0.0"; + sha256 = "009d4ai8dqhxcrgkd0d37l97dkiqh7qmr1wvhwj38mblrhpgpm3z"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show QuickCheck quickcheck-io random-shuffle safe - safe-coloured-text safe-coloured-text-terminfo split stm text yaml + safe-coloured-text safe-coloured-text-terminfo split stm text ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text @@ -264050,17 +264878,18 @@ self: { }) {}; "sydtest-aeson" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, path - , path-io, sydtest, sydtest-discover, text + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.0.0.0"; - sha256 = "0x4n27v60m6h44xwpf60j11j1r9r1zzixlszq21skrf2r6lla2gn"; + version = "0.1.0.0"; + sha256 = "1kidxlaw8snyzl0nq2vynjz179blh03cvg2qdjr5j521cjxxmwf8"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring path path-io sydtest text + aeson aeson-pretty base bytestring deepseq path path-io sydtest + text ]; - testHaskellDepends = [ aeson base sydtest text ]; + testHaskellDepends = [ aeson base directory sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "An aeson companion library for sydtest"; license = "unknown"; @@ -264113,8 +264942,8 @@ self: { }: mkDerivation { pname = "sydtest-hedgehog"; - version = "0.1.0.0"; - sha256 = "0p0aj2jd6cgi3mdzdlwksczikxsx9ajh0lcvd6k4059x1ddjxplb"; + version = "0.2.0.0"; + sha256 = "084nqzl1i5phy0hwdgcx0dvlajr8g1iva73f3j9y9rsgl08wh727"; libraryHaskellDepends = [ base containers hedgehog stm sydtest ]; testHaskellDepends = [ base hedgehog sydtest ]; testToolDepends = [ sydtest-discover ]; @@ -264149,8 +264978,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.1.0.0"; - sha256 = "17j48cp7n0smci0m42yyvkz0rd5xfrysb2f6hwxaqhl703ifhlyy"; + version = "0.3.0.0"; + sha256 = "1vda3jhgnqbs0sw219li3s83vyqr1k1hzvy0prr2c4hv62cr47p3"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -264204,19 +265033,19 @@ self: { "sydtest-persistent-postgresql" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent - , persistent-postgresql, persistent-template, sydtest - , sydtest-discover, sydtest-persistent, tmp-postgres + , persistent-postgresql, sydtest, sydtest-discover + , sydtest-persistent, tmp-postgres }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.2.0.0"; - sha256 = "0c3f9m3d7nryb2xvfp7zrqqi9136mgf89ccwg8vlaapnx1bqap43"; + version = "0.2.0.1"; + sha256 = "1j4mb5vxwcdpfnrbk1xk8cg9s93dzndhdg2b4xgb91ix1c2ly5rz"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-postgresql sydtest sydtest-persistent tmp-postgres ]; testHaskellDepends = [ - base persistent persistent-postgresql persistent-template sydtest + base persistent persistent-postgresql sydtest ]; testToolDepends = [ sydtest-discover ]; description = "An persistent-postgresql companion library for sydtest"; @@ -264226,20 +265055,17 @@ self: { "sydtest-persistent-sqlite" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent - , persistent-sqlite, persistent-template, sydtest, sydtest-discover - , sydtest-persistent + , persistent-sqlite, sydtest, sydtest-discover, sydtest-persistent }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.2.0.0"; - sha256 = "1l17n6hgc64ngjfdgg6c1zhnlg6ks9bvb7hbv5yf454bhbm6p83s"; + version = "0.2.0.1"; + sha256 = "1hy0i03pmdxmrw8nh07m8s7vr9af7m54gw0myn6flw9x57s2zk7v"; libraryHaskellDepends = [ - base monad-logger mtl persistent persistent-sqlite - persistent-template sydtest sydtest-persistent - ]; - testHaskellDepends = [ - base persistent persistent-sqlite persistent-template sydtest + base monad-logger mtl persistent persistent-sqlite sydtest + sydtest-persistent ]; + testHaskellDepends = [ base persistent persistent-sqlite sydtest ]; testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; @@ -264283,19 +265109,18 @@ self: { }) {}; "sydtest-servant" = callPackage - ({ mkDerivation, base, http-client, servant, servant-client - , servant-server, stm, sydtest, sydtest-discover, sydtest-wai + ({ mkDerivation, base, http-client, servant-client, servant-server + , stm, sydtest, sydtest-discover, sydtest-wai }: mkDerivation { pname = "sydtest-servant"; - version = "0.2.0.1"; - sha256 = "1yclwmcqp6wkcd980ha7a93dz99zc55mcw2z5fwhk3gfwdpdfyfj"; + version = "0.2.0.2"; + sha256 = "0gmaf1p7f588mvcf486wb32qjh74gvqyf965wczh5h0phgyg2f8z"; libraryHaskellDepends = [ - base http-client servant servant-client servant-server sydtest - sydtest-wai + base http-client servant-client servant-server sydtest sydtest-wai ]; testHaskellDepends = [ - base servant servant-client servant-server stm sydtest sydtest-wai + base servant-client servant-server stm sydtest sydtest-wai ]; testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; @@ -268862,6 +269687,8 @@ self: { pname = "telegram-bot-simple"; version = "0.5"; sha256 = "0mzzq7lfl56h1i9dr617h5vcv47j2nsf77pkq18s8wk5zrc67r2w"; + revision = "1"; + editedCabalFile = "0nz2g3jfb3l66ixrxlz257pmg2qbg7l6wsi0q38iv8fl4483md2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -271065,6 +271892,26 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_7" = callPackage + ({ mkDerivation, base, bytestring, criterion, QuickCheck + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder-dev + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.7"; + sha256 = "00pl4jbqpcrfc00m3hf871g9k7s0n6xf2igb7ba1dnqh76w4lw4h"; + libraryHaskellDepends = [ base bytestring text text-builder-dev ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "An efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-dev" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , QuickCheck, quickcheck-instances, rerebase, split, tasty @@ -271088,6 +271935,28 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, deferred-folds + , QuickCheck, quickcheck-instances, rerebase, split, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.1"; + sha256 = "18ipiiqrr0hz0yl7lqv2y730vl6mzqp0jg1yir097gp53ky6hzyw"; + libraryHaskellDepends = [ + base bytestring deferred-folds split text transformers + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -273744,6 +274613,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_8_0" = callPackage + ({ mkDerivation, async, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, exceptions, hint, hosc, microspec + , mtl, network, parsec, primitive, random, text, transformers + , weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.8.0"; + sha256 = "19gh5l8hna9s4k5qw98qcr1s9wpqi6mf2kxd4kz6lzl3yxj56y6z"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq + exceptions hosc mtl network parsec primitive random text + transformers + ]; + executableHaskellDepends = [ async base exceptions hint ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -279586,17 +280483,19 @@ self: { "twain" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie - , either, exceptions, http-types, http2, text, time, transformers - , vault, wai, wai-extra + , either, exceptions, hspec, hspec-discover, hspec-wai, http-types + , http2, text, time, transformers, vault, wai, wai-extra }: mkDerivation { pname = "twain"; - version = "2.0.1.0"; - sha256 = "0wal0qr3bacy7phgbvi2sif5q490jk8mhw675lpl2ch8dmmf769p"; + version = "2.1.0.0"; + sha256 = "0ffppxfdrjgqr3csm2cwsc2sgxgrl9dqx60n2zffnh3c7qc7z749"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra ]; + testHaskellDepends = [ base hspec hspec-discover hspec-wai ]; + testToolDepends = [ hspec-discover ]; description = "Tiny web application framework for WAI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -280215,6 +281114,7 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Text"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "txt-sushi" = callPackage @@ -281075,16 +281975,20 @@ self: { }) {}; "typecheck-plugin-nat-simple" = callPackage - ({ mkDerivation, base, containers, ghc }: + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra }: mkDerivation { pname = "typecheck-plugin-nat-simple"; - version = "0.1.0.4"; - sha256 = "0ybkkfk9ha3f1f5cq45r0rmnws0ai6imwic0srf78d6ys3q5n5n5"; + version = "0.1.0.6"; + sha256 = "0qhqys9kiisgy8gwfz92ffvmccgan2v95zxyfnbjqj1z9ks26br5"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base containers ghc ]; - testHaskellDepends = [ base containers ghc ]; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base containers ghc ghc-tcplugins-extra ]; description = "Simple type check plugin which calculate addition, subtraction and less-or-equal-than"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-admin" = callPackage @@ -283829,6 +284733,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Universal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "universal-binary" = callPackage @@ -284300,6 +285205,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_22_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.22.0"; + sha256 = "125vzwkzp53i5n0yxy7bbivpzgf3c7ynsfhn04xk1ymy9fqsvi0z"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -284453,7 +285384,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "unordered-containers_0_2_18_0" = callPackage + "unordered-containers_0_2_19_1" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers , deepseq, hashable, hashmap, HUnit, mtl, nothunks, QuickCheck , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck @@ -284461,8 +285392,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.18.0"; - sha256 = "09cvqdqaqbf0z5i0hbkgn7hkz44plniznj6zimdx0a86i6lhq3b2"; + version = "0.2.19.1"; + sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -285884,11 +286815,13 @@ self: { pname = "util"; version = "0.1.17.1"; sha256 = "1qhx4r27sny25sykacf5xi5br4msq4335ghp5zc3fq0lii3866s7"; - revision = "1"; - editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb"; + revision = "2"; + editedCabalFile = "0z9bf05jn5y9k5nrjksfpzjml5xchjrj3nk3jh90g8pygs2658rb"; libraryHaskellDepends = [ base transformers ]; description = "Utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "util-exception" = callPackage @@ -286295,10 +287228,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.5"; - sha256 = "14d7gyf3sa2874r0dhj3ydvmb1iz174kp4pxz7aq984zb4m6d87z"; - revision = "2"; - editedCabalFile = "1202zn5f70f1yvmaknm8l34igg9ihyqs8lhch4ihvx9vcqxs3c0v"; + version = "1.4.6"; + sha256 = "0is5f2fn5ip93wla33dcjpl8hscpcwyv6cpxcmqs25vvbwz27kvz"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -286600,6 +287531,7 @@ self: { libraryHaskellDepends = [ base util ]; description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "valid-names" = callPackage @@ -286806,16 +287738,27 @@ self: { license = lib.licenses.mit; }) {}; + "validity_0_12_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.12.0.1"; + sha256 = "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.4"; - sha256 = "1k0x6va9mmz0z9hgd1is71ks4fgbziw53rm7r6jsidp4ksszdzm0"; - revision = "1"; - editedCabalFile = "1zhqg6hac0js33yn0xw10pcp11hbygr95vmcmgpp3sdxdhgpbnmy"; + version = "0.2.0.5"; + sha256 = "0gk2mqhsailjp3130jgd17j2254kx28fnhhwyi1f66is1axw6cmj"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -286838,6 +287781,22 @@ self: { license = lib.licenses.mit; }) {}; + "validity-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, genvalidity-hspec, hspec + , validity + }: + mkDerivation { + pname = "validity-case-insensitive"; + version = "0.0.0.0"; + sha256 = "075pxgviqmf5xi4if15mbabn32xw11nss19a4il9z9ng1fsrcn1d"; + libraryHaskellDepends = [ base case-insensitive validity ]; + testHaskellDepends = [ + base case-insensitive genvalidity-hspec hspec validity + ]; + description = "Validity instances for case-insensitive"; + license = lib.licenses.mit; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -286911,6 +287870,18 @@ self: { license = lib.licenses.mit; }) {}; + "validity-text_0_3_1_3" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.1.3"; + sha256 = "0igxjd53aqlhhnjilbyjsxs4hjc8b21mpi504kc8c60q0ysq7vks"; + libraryHaskellDepends = [ base bytestring text validity ]; + description = "Validity instances for text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -290132,36 +291103,6 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.8"; - sha256 = "0ddgdr0304b3kg50vfjsg3bxlhfp3vmsb4c8i80k8adqzh54hz5l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types http2 HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit iproute resourcet text time transformers wai - zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_10" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, http-types - , http2, HUnit, iproute, network, resourcet, streaming-commons - , text, time, transformers, unix, vault, wai, wai-logger, word8 - , zlib - }: - mkDerivation { - pname = "wai-extra"; version = "3.1.10"; sha256 = "0ldzwcjgj0k3ma25y4jaywv4g4bjjnn75ixlk1h4r4f3iapxm6kr"; isLibrary = true; @@ -290180,7 +291121,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -292598,24 +293538,6 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.14.3"; - sha256 = "1a66m261ilqafbwwgjvalh3rz38qxcwxw9a99wr18lm0ah27lvx4"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck text ]; - description = "portable, type-safe URL routing"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes_0_27_14_4" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; version = "0.27.14.4"; sha256 = "10zpyxigrmp97x7xd9aw8kn925ygjf0jv8hppxmksjf9a6pvyfn1"; libraryHaskellDepends = [ @@ -292625,26 +293547,12 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-boomerang" = callPackage ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.4.2"; - sha256 = "09vq5gfxibrbh65a4y94crcb99s848rx56grmfny89ccdv6r5a3y"; - libraryHaskellDepends = [ - base boomerang mtl parsec text web-routes - ]; - description = "Use boomerang for type-safe URL parsers/printers"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-boomerang_0_28_4_3" = callPackage - ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: - mkDerivation { - pname = "web-routes-boomerang"; version = "0.28.4.3"; sha256 = "1cdn29084i2bvsh7pa6d4dr5bgpixix36dhi49q8nbcbp02qycap"; libraryHaskellDepends = [ @@ -292652,7 +293560,6 @@ self: { ]; description = "Use boomerang for type-safe URL parsers/printers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-generics" = callPackage @@ -292672,21 +293579,6 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.12.1"; - sha256 = "06gifknfv6g9rd9f83r75hc3sld4xb4f1czxs9k5ca7n1l1vlccy"; - libraryHaskellDepends = [ - base bytestring happstack-server text web-routes - ]; - description = "Adds support for using web-routes with Happstack"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-happstack_0_23_12_2" = callPackage - ({ mkDerivation, base, bytestring, happstack-server, text - , web-routes - }: - mkDerivation { - pname = "web-routes-happstack"; version = "0.23.12.2"; sha256 = "01ks9c8bln8yiff7dqfm3ai7scci304q94w1zaqvzph57m1whrd6"; libraryHaskellDepends = [ @@ -292694,30 +293586,17 @@ self: { ]; description = "Adds support for using web-routes with Happstack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-hsp" = callPackage ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { pname = "web-routes-hsp"; - version = "0.24.6.1"; - sha256 = "1arc22l7xk49fp80i1fkvj8xj71lqxrs2g5gnvjzwlkc0azzaz6a"; - libraryHaskellDepends = [ base hsp text web-routes ]; - description = "Adds XMLGenerator instance for RouteT monad"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-hsp_0_24_6_2" = callPackage - ({ mkDerivation, base, hsp, text, web-routes }: - mkDerivation { - pname = "web-routes-hsp"; version = "0.24.6.2"; sha256 = "0cmijyklkrakcwfmwfa70kbm619p1dfl900lx57mca23k8m2aksn"; libraryHaskellDepends = [ base hsp text web-routes ]; description = "Adds XMLGenerator instance for RouteT monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes-mtl" = callPackage @@ -292795,21 +293674,6 @@ self: { }: mkDerivation { pname = "web-routes-wai"; - version = "0.24.3.1"; - sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; - libraryHaskellDepends = [ - base bytestring http-types text wai web-routes - ]; - description = "Library for maintaining correctness of URLs within an application"; - license = lib.licenses.bsd3; - }) {}; - - "web-routes-wai_0_24_3_2" = callPackage - ({ mkDerivation, base, bytestring, http-types, text, wai - , web-routes - }: - mkDerivation { - pname = "web-routes-wai"; version = "0.24.3.2"; sha256 = "1cdahkpw0194gdx11g4h4313ni0b6sdj9j5r666rgwwzr22wgql7"; libraryHaskellDepends = [ @@ -292817,7 +293681,6 @@ self: { ]; description = "Library for maintaining correctness of URLs within an application"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-routing" = callPackage @@ -298471,8 +299334,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.2"; sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4"; - revision = "3"; - editedCabalFile = "00a7ymnzf87p6dv6mphziycyx6p97xbbbvg8fzbqa6am4pvr029z"; + revision = "4"; + editedCabalFile = "1q4f9pvyrkrw793kvd1lxzpzf49h2rs8zdmmhsli487sllflghnq"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -299998,6 +300861,33 @@ self: { license = lib.licenses.mit; }) {}; + "yaml-unscrambler_0_1_0_10" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time + , base, base64-bytestring, bytestring, conduit, containers, foldl + , hashable, libyaml, mtl, neat-interpolation, QuickCheck + , quickcheck-instances, rerebase, scientific, selective, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder-dev, time + , transformers, unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "yaml-unscrambler"; + version = "0.1.0.10"; + sha256 = "07pwdd6w6gh0x05925hfk5mhzmig6rh9yb87rkyx15197r9hj7xw"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data attoparsec-time base + base64-bytestring bytestring conduit containers foldl hashable + libyaml mtl scientific selective text text-builder-dev time + transformers unordered-containers uuid vector yaml + ]; + testHaskellDepends = [ + foldl neat-interpolation QuickCheck quickcheck-instances rerebase + tasty tasty-hunit tasty-quickcheck + ]; + description = "Flexible declarative YAML parsing toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml2owl" = callPackage ({ mkDerivation, base, containers, directory, filepath, network , network-uri, swish, text, xml, yaml @@ -301406,8 +302296,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.22.0"; - sha256 = "0vc60va1lj7a409ljpipk90k89pycsf7zfpvdn0bvsqgsy75qgq6"; + version = "1.6.23"; + sha256 = "06v475xa2qbgsqx2gk1lz4y8xwb4d1ak06cw75ig3ji7d1knq4w2"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -301430,6 +302320,44 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-core_1_6_23_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, entropy + , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit + , memory, monad-logger, mtl, network, parsec, path-pieces + , primitive, random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.23.1"; + sha256 = "1s9wa9xw9ximivwv9bk7lf4w20yhlcy8vyp2i3j6w4fig918qxg9"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq entropy fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -302658,32 +303586,6 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.12"; - sha256 = "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory mtl network pretty-show text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = lib.licenses.mit; - }) {}; - - "yesod-test_1_6_13" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network - , pretty-show, text, time, transformers, unliftio, unliftio-core - , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; version = "1.6.13"; sha256 = "1r5ip85x0shv00dvznd201fbl9gi90nkk33szmh0cz77x8960v19"; libraryHaskellDepends = [ @@ -302699,7 +303601,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -305474,4 +306375,28 @@ self: { broken = true; }) {}; + "zyre2" = callPackage + ({ mkDerivation, base, bytestring, containers, czmq, inline-c, text + , zyre + }: + mkDerivation { + pname = "zyre2"; + version = "0.1.1.0"; + sha256 = "0dqlp60mamqmga6g87qawxg1646czgzhqm441cxpw1dkrshv08jk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c text + ]; + librarySystemDepends = [ czmq zyre ]; + executableHaskellDepends = [ + base bytestring containers inline-c text + ]; + testHaskellDepends = [ base bytestring containers inline-c text ]; + description = "Haskell zyre bindings for reliable group messaging over local area networks"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) czmq; zyre = null;}; + } diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 992caf200a748..0426a72c81aad 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -11,21 +11,21 @@ let name = "cbqn-bytecode-files"; owner = "dzaima"; repo = "CBQN"; - rev = "b000b951aa8f3590b196b4c09056604c0b32a168"; - hash = "sha256-znW0xOXogP4TfifUmk3cs4aN/9mMSpSD2WJppmeI1Fg="; + rev = "c39653c898531a2cdbf4cc5c764df6e37b1894a4"; + hash = "sha256-JCEmkwh5Rv5+NQoxvefSrYnayU892/Wam+gjMgcQmO0="; }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+date=2021-12-13"; + version = "0.pre+date=2022-05-06"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "e7662b0f6a44add0749fba2a6d7309a5c1eb2601"; - hash = "sha256-2nfkTZBIGHX5cok6Ea3KSewakZy8Ey8nSO2Fe4xGgvg="; + rev = "3496a939b670f8c9ca2a04927378d6b7e9abd68e"; + hash = "sha256-P+PoY4XF9oEw7VIpmybvPp+jxWHEo2zt1Lamayf1mHg="; }; dontConfigure = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' + (if genBytecode then '' ${bqn-path} genRuntime ${mbqn-source} '' else '' - cp ${cbqn-bytecode-files}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/ + cp ${cbqn-bytecode-files}/src/gen/{compiles,formatter,runtime0,runtime1,src} src/gen/ ''); installPhase = '' @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 1f663b5488d2d..b5ba81ebc280a 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM="; + sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/hy/builder.nix b/pkgs/development/interpreters/hy/builder.nix deleted file mode 100644 index 6757f859ac14a..0000000000000 --- a/pkgs/development/interpreters/hy/builder.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, python3Packages -, hyDefinedPythonPackages /* Packages like with python.withPackages */ -, ... -}: -python3Packages.buildPythonApplication rec { - pname = "hy"; - version = "1.0a1"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "sha256-lCrbvbkeutSNmvvn/eHpTnJwPb5aEH7hWTXYSE+AJmU="; - }; - - checkInputs = with python3Packages; [ flake8 pytest ]; - - propagatedBuildInputs = with python3Packages; [ - appdirs - astor - clint - colorama - fastentrypoints - funcparserlib - rply - pygments - ] ++ (hyDefinedPythonPackages python3Packages); - - # Hy does not include tests in the source distribution from PyPI, so only test executable. - checkPhase = '' - $out/bin/hy --help > /dev/null - ''; - - meta = with lib; { - description = "A LISP dialect embedded in Python"; - homepage = "https://hylang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ nixy mazurel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix deleted file mode 100644 index f5d80c11d7115..0000000000000 --- a/pkgs/development/interpreters/hy/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib -, callPackage -, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ -}: -let - withPackages = ( - python-packages: callPackage ./builder.nix { - hyDefinedPythonPackages = python-packages; - } - ); -in -(withPackages hyDefinedPythonPackages) // { - # Export withPackages function for hy customization - inherit withPackages; -} diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 24e10eb7306aa..cfc1c12d1923a 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "An interpreter of K, APL-like programming language"; homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; + mainProgram = "k"; platforms = platforms.all; license = licenses.isc; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 6ecc3ad605360..08c225603eb3d 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://moarvm.org"; license = licenses.artistic2; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + mainProgram = "moar"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 5743a18c0fd0c..961c63a3037fe 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , gtk3 , meson , ninja , pkg-config , gobject-introspection +, gtk-doc +, docbook-xsl-nons , gnome , dbus , xvfb-run @@ -12,11 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.3.1"; + version = "5.4.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; + sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA="; }; nativeBuildInputs = [ @@ -25,6 +30,8 @@ stdenv.mkDerivation rec { pkg-config dbus gobject-introspection + gtk-doc + docbook-xsl-nons ]; buildInputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 9b07697a6a9ac..56268146c5db4 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -93,14 +93,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; license = licenses.lgpl21Plus; + mainProgram = "appstreamcli"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aribb25/default.nix b/pkgs/development/libraries/aribb25/default.nix index 3e171d757973e..743850c5fdc3b 100644 --- a/pkgs/development/libraries/aribb25/default.nix +++ b/pkgs/development/libraries/aribb25/default.nix @@ -48,10 +48,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.isDarwin "pcsclite_CFLAGS=-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; meta = with lib; { - homepage = "https://code.videolan.org/videolan/aribb25"; description = "Sample implementation of the ARIB STD-B25 standard"; - platforms = platforms.all; + homepage = "https://code.videolan.org/videolan/aribb25"; license = licenses.isc; maintainers = with maintainers; [ midchildan ]; + mainProgram = "b25"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index b3e3a34973c01..6737d76538e0e 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; + mainProgram = "smfsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index b6fcb11c31586..5b8590750178d 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.11"; + version = "0.6.13"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; + sha256 = "sha256-f1STZdxj8cdK60dCgl2Xfsqaa/x3Z1xEjH3p4GUwGUg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index e7f0c0854dbb4..40e8a5eb54c56 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.14"; + version = "0.5.17"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; + sha256 = "sha256-peaoTv2TLqtHScfnCPMNbE6fhUTKfRe1ZzuBsr/rpz0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ab52fa5aa746b..1b8f7e73e822b 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.19"; + version = "0.7.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; + sha256 = "sha256-DKorZUVUDEP4IRPchzaW35fPLmYoJRcfLMdPHrBrol8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index a25231ee88316..0eee407f989a4 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.10"; + version = "0.6.15"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU="; + sha256 = "sha256-WIKWF8G+fdX9MD6vQctM+5pDnR0/0TenabWE4PRteq8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index f19a69fc45737..0a9bb5543735d 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.19"; + version = "0.11.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; + sha256 = "sha256-LIrAA3+Yd0lhCMQ9R4HT/ZFKm3y9iSm3h5vcn0ghiPA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 2868e6b80b86b..398a36019f544 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -6,19 +6,20 @@ , aws-c-compression , aws-c-http , aws-c-io +, aws-checksums , cmake , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.33"; + version = "0.1.39"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; + sha256 = "sha256-UbYh3awI7Y3mJnVQrltU+rZ1TI1TDaMF5TOcvxbzNa8="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { aws-c-compression aws-c-http aws-c-io + aws-checksums s2n-tls ]; @@ -44,7 +46,8 @@ stdenv.mkDerivation rec { description = "C99 library implementation for communicating with the S3 service"; homepage = "https://github.com/awslabs/aws-c-s3"; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; + mainProgram = "s3"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 391ecc26fb86e..201837eb53639 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , aws-c-auth , aws-c-cal , aws-c-common @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.16"; + version = "0.17.28"; outputs = [ "out" "dev" ]; @@ -24,13 +25,22 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; + sha256 = "sha256-4/BgwX8Pa5D2lEn0Dh3JlUiYUtA9u0rWpBixqmv1X/A="; }; patches = [ # Correct include path for split outputs. # https://github.com/awslabs/aws-crt-cpp/pull/325 ./0001-build-Make-includedir-properly-overrideable.patch + + # Fix build with new input stream api + # https://github.com/awslabs/aws-crt-cpp/pull/341 + # Remove with next release + (fetchpatch { + url = "https://github.com/awslabs/aws-crt-cpp/commit/8adb8490fd4f1d1fe65aad01b0a7dda0e52ac596.patch"; + excludes = [ "crt/*" ]; + sha256 = "190v8rlj6z0qllih6w3kqmdvqjifj66hc4bchsgr3gpfv18vpzid"; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 7a3c8bc727be9..3d396a0b28556 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,21 +11,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.90"; + version = "0.1.92"; outputs = [ "out" "dev" ]; - patches = [ - # Fix darwin build - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; - sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; - }) - ]; - src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; + sha256 = "sha256-9mdzUCiUS2N1rRjxYKZM65P1x9zKqdh1HeNZd3SIosE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index aace36c619c00..0f251f73e81b4 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c7520ff783e51..b49355f60e93e 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; + mainProgram = "booldnf"; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index adc52da1e560f..6f5a8e340ad68 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { description = "Advanced disassembly library"; homepage = "http://www.capstone-engine.org"; license = lib.licenses.bsd3; - platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ris ]; + mainProgram = "cstool"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 37bde1caf4375..8add9c623470d 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; + mainProgram = "checkmk"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 396acbc1bdf22..8b1757ed56342 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; + homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; + mainProgram = "faad"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 434d445ceb480..5c7f0c44f91c9 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A language independent, scalable, open extension to CG"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; + mainProgram = "cgi-fcgi"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix index 1cdfb4b9c8703..c06dad87d9590 100644 --- a/pkgs/development/libraries/flatbuffers/generic.nix +++ b/pkgs/development/libraries/flatbuffers/generic.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ maintainers.teh ]; + homepage = "https://google.github.io/flatbuffers/"; license = licenses.asl20; + maintainers = [ maintainers.teh ]; + mainProgram = "flatc"; platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1e9c881ae8ce8..cbed6a62a3c58 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -149,8 +149,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - maintainers = [ maintainers.eelco ] ++ teams.gnome.members; license = licenses.lgpl21Plus; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; + mainProgram = "gdk-pixbuf-thumbnailer"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 84d54b3bc35ea..48e2d4fd8fb33 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; + mainProgram = "gensiot"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index e0ef34a451e31..f1f3df86349e6 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.72.0"; + version = "2.72.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-eCkkvxNklvOHj9wqCqnvQPDFFeLD4FTK/6XS5SOAxx4="; + sha256 = "sha256-KnZJooq13FOsTau3bJ9hWZ+8Yokjq2p910v2ddkVXNg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 8ba33b98634e2..996eacd65f4c6 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.3"; + version = "2.66.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-r7liAkkUhdP0QQLZghmhctotP563j848+5JVm6SW5Jk="; + sha256 = "sha256-GZrOVoLYGxWh1WVIC0qVBoLy22QCyKpd1yF9ce3/gdU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a46c84844e891..7551c15649e67 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + mainProgram = "glpsol"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 5d682e23b277c..49f21fa540418 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-88qik6Xob2zK0Y+BcnPbHGcGHmgNedg5qop1KOW7JtY="; + sha256 = "sha256-JDOrYG0kTDUk3luBIJTbimcPsR7Z/3GAwtAhrh/J/AU="; }; patches = [ diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2d0921cf097fb..420dee6cbaafc 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.5"; + version = "3.24.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; + sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/development/libraries/keystone/default.nix index 70864bcf24a9e..0bb979f7a5503 100644 --- a/pkgs/development/libraries/keystone/default.nix +++ b/pkgs/development/libraries/keystone/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keystone-engine.org"; license = licenses.gpl2Only; maintainers = with maintainers; [ luc65r ]; + mainProgram = "kstool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix new file mode 100644 index 0000000000000..426aaf3c581e9 --- /dev/null +++ b/pkgs/development/libraries/kompute/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, vulkan-headers +, vulkan-loader +, fmt +, glslang +, ninja +}: + +stdenv.mkDerivation rec { + pname = "kompute"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "KomputeProject"; + repo = "kompute"; + rev = "v${version}"; + sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo="; + }; + + cmakeFlags = [ + "-DKOMPUTE_OPT_INSTALL=1" + "-DRELEASE=1" + "-DKOMPUTE_ENABLE_SPDLOG=1" + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ fmt ]; + propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ]; + + meta = with lib; { + description = "General purpose GPU compute framework built on Vulkan"; + longDescription = '' + General purpose GPU compute framework built on Vulkan to + support 1000s of cross vendor graphics cards (AMD, + Qualcomm, NVIDIA & friends). Blazing fast, mobile-enabled, + asynchronous and optimized for advanced GPU data + processing usecases. Backed by the Linux Foundation" + ''; + homepage = "https://kompute.cc/"; + license = licenses.asl20; + maintainers = with maintainers; [ atila ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 1ccb0e41e7086..6712d7c6d3c0a 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with the aim of simplifying DNS programming in C"; - license = licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; - platforms = platforms.unix; + license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "drill"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index eb8e6333d419d..19ca4fab40139 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.argon2.com/"; license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; + mainProgram = "argon2"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix index 78e4b5cfa4045..5340f62a32edc 100644 --- a/pkgs/development/libraries/libaudec/default.nix +++ b/pkgs/development/libraries/libaudec/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { - homepage = "https://www.zrythm.org"; description = "A library for reading and resampling audio files"; + homepage = "https://www.zrythm.org"; license = licenses.agpl3Plus; + mainProgram = "audec"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 987a36cd79fe5..88bc059892cf9 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C routines for fast base64 encoding/decoding"; + homepage = "https://github.com/libb64/libb64"; license = lib.licenses.publicDomain; + mainProgram = "base64"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbencodetools/default.nix b/pkgs/development/libraries/libbencodetools/default.nix index b8150a90f6838..42e6fb9f4ede8 100644 --- a/pkgs/development/libraries/libbencodetools/default.nix +++ b/pkgs/development/libraries/libbencodetools/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/heikkiorsila/bencodetools"; license = licenses.bsd2; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "bencat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f9b6538027d6f..ba24182ade80a 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; + homepage = "http://libburnia-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + mainProgram = "cdrskin"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index bf20211ee60a9..4848f5fcc2659 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "C library to access data on a CDDB server (freedb.org)"; homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; + mainProgram = "cddb_query"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 999c04504898b..36b591b0605b3 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { This is a port of xiph.org's cdda paranoia to use libcdio for CDROM access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; - license = licenses.gpl3; homepage = "https://github.com/rocky/libcdio-paranoia"; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3; maintainers = [ ]; + mainProgram = "cd-paranoia"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 2898c9a1c835e..f5a9974f3bcfa 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ client library for the CMIS interface"; - homepage = "https://sourceforge.net/projects/libcmis/"; + homepage = "https://github.com/tdf/libcmis"; license = licenses.gpl2; + mainProgram = "cmis-client"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index a666eb3a650be..379f5397ec048 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreServices; meta = with lib; { - homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; + homepage = "https://sourceforge.net/projects/libdc1394/"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; + mainProgram = "dc1394_reset_bus"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index dd1707ec96ffb..462434f9839e0 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -5,6 +5,7 @@ , openssl , perl , pkg-config +, python3 , rustPlatform , sqlcipher , sqlite @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.79.0"; + version = "1.80.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ="; + hash = "sha256-4b2tf7QmLQ5ltnkxUGCwA1TZSQRoyKaRGcxBxbSKDaE="; }; patches = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU="; + hash = "sha256-t1/xztmiuJMqNkIe7cBzO7MaZQb6GtnIX5wxEpC+IFo="; }; nativeBuildInputs = [ @@ -60,6 +61,10 @@ stdenv.mkDerivation rec { cargoCheckHook ]; + passthru.tests = { + python = python3.pkgs.deltachat; + }; + meta = with lib; { description = "Delta Chat Rust Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/"; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 7ee268e4e7d97..a639b4b32947a 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "Library for creating DigiDoc signature files"; homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; - platforms = platforms.unix; maintainers = [ maintainers.jagajaga ]; + mainProgram = "cdigidoc"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 70fab2da56884..3a3abdc5e9ac1 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Small LD_PRELOAD library to disable fsync and friends"; homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = licenses.gpl3Plus; + mainProgram = "eatmydata"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index ae0529718259c..1269f6f0eff3b 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libestr]; meta = { - homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; - platforms = lib.platforms.unix; + homepage = "http://www.libee.org/"; license = lib.licenses.lgpl21Plus; + mainProgram = "libee-convert"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index c315379d92c73..39369c5c3b6be 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; - platforms = platforms.all; license = licenses.bsd3; + mainProgram = "createfp"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix new file mode 100644 index 0000000000000..a1e2ff8c5888b --- /dev/null +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoreconfHook + +, doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping +, dejagnu +}: + +stdenv.mkDerivation rec { + pname = "libffi"; + version = "3.3"; + + src = fetchurl { + url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY="; + }; + + patches = []; + + outputs = [ "out" "dev" "man" "info" ]; + + configureFlags = [ + "--with-gcc-arch=generic" # no detection of -march= or -mtune= + "--enable-pax_emutramp" + + # Causes issues in downstream packages which misuse ffi_closure_alloc + # Reenable once these issues are fixed and merged: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 + # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 + "--disable-exec-static-tramp" + ]; + + preCheck = '' + # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} + ''; + + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling. + + inherit doCheck; + + checkInputs = [ dejagnu ]; + + meta = with lib; { + description = "A foreign function call interface library"; + longDescription = '' + The libffi library provides a portable, high level programming + interface to various calling conventions. This allows a + programmer to call any function specified by a call interface + description at run-time. + + FFI stands for Foreign Function Interface. A foreign function + interface is the popular name for the interface that allows code + written in one language to call code written in another + language. The libffi library really only provides the lowest, + machine dependent layer of a fully featured foreign function + interface. A layer must exist above libffi that handles type + conversions for values passed between the two languages. + ''; + homepage = "http://sourceware.org/libffi/"; + license = licenses.mit; + maintainers = with maintainers; [ armeenm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index dc12e643cb75e..10f3ceaac2626 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , python3 @@ -16,23 +15,16 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.4.0"; + version = "1.4.3"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + sha256 = "sha256-WnRzH5uMVEStA5ns4GNgMD5YoLQoats9aPLfnz9RoQs="; }; - patches = [ - (fetchpatch { - url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; - sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; - }) - ]; - cmakeFlags = [ "-DTHREADSAFE=ON" "-DUSE_HTTP_PARSER=system" @@ -48,11 +40,11 @@ stdenv.mkDerivation rec { doCheck = false; # hangs. or very expensive? - meta = { + meta = with lib; { description = "Linkable library implementation of Git that you can use in your application"; homepage = "https://libgit2.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 35d01cd3e820d..5be5ecfd82e43 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = [ ]; + mainProgram = "iconv"; # This library is not needed on GNU platforms. hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index 6a2f926d79ef1..c10d46577ff68 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -39,16 +39,17 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/libimobiledevice/libirecovery"; description = "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux"; longDescription = '' libirecovery is a cross-platform library which implements communication to iBoot/iBSS found on Apple's iOS devices via USB. A command-line utility is also provided. ''; + homepage = "https://github.com/libimobiledevice/libirecovery"; license = licenses.lgpl21; + maintainers = with maintainers; [ nh2 ]; + mainProgram = "irecovery"; # Upstream description says it works on more platforms, but packager hasn't tried that yet platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 89a23dccc7e8e..10c2bfb272c80 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -1,50 +1,20 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , doxygen , fetchFromGitLab -, ffmpeg -, gdk-pixbuf -, glib -, graphviz -, gtk2 -, intltool , jsoncpp -, libexosip -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 , libxml2 , lime -, makeWrapper -, mbedtls , mediastreamer -, openldap -, ortp -, pango -, pkg-config , python3 -, readline , bc-soci -, boost -, speex , sqlite , lib , stdenv -, udev , xercesc -, xsd -, zlib }: stdenv.mkDerivation rec { @@ -62,69 +32,31 @@ stdenv.mkDerivation rec { patches = [ ./use-normal-jsoncpp.patch ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; - # TODO: Not sure if all these inputs are actually needed. Most of them were - # defined when liblinphone and linphone-desktop weren't separated yet, so some - # of them might not be needed for liblinphone alone. buildInputs = [ - (python3.withPackages (ps: [ ps.pystache ps.six ])) - # Made by BC - bcg729 - bctoolbox belcard belle-sip - belr - bzrtp lime mediastreamer - ortp # Vendored by BC bc-soci - # Vendored by BC but we use upstream, might cause problems - libmatroska - - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip - libnotify - libosip - libsoup - libupnp + jsoncpp libxml2 - mbedtls - openldap - pango - readline - boost - speex + (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite - udev xercesc - xsd - zlib - jsoncpp ]; nativeBuildInputs = [ - # Made by BC - bcunit - cmake doxygen - graphviz - intltool - makeWrapper - pkg-config ]; strictDeps = true; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index af4190f968333..184d9932eb281 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with lib; { - homepage = "https://www.liblognorm.com/"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; + homepage = "https://www.liblognorm.com/"; license = licenses.lgpl21; + mainProgram = "lognormalizer"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 1c15519aaff92..855296bddb455 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - platforms = platforms.all; maintainers = [ maintainers.vcunat ]; + mainProgram = "mmdblookup"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 2a74c79afaf07..3a0ced3d98016 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib, fetchpatch }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "09pinxqw3z3hxrafn67clw1cb1z9aqfy6gkiavginfm0yr299gk9"; + sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen zlib ]; - - patches = [ - # fixes pkgsMusl.libmediainfo build - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/libmediainfo/fix-include-signal.patch?id=b8d666a3d33575c184308e1176f4de9e519af577"; - sha256 = "sha256-b3HoIwy/hKSh8jUakwVJpnPmYw5KUwZXgLW7IPMY4/c="; - }) - ]; + buildInputs = [ zlib ]; + propagatedBuildInputs = [ libzen ]; postPatch = "cd Project/GNU/Library"; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 54177ad559d6a..f718170fc76c8 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; + mainProgram = "natpmpc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index d3b857d76739f..eb89fa124c419 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libnotify"; description = "A library that sends desktop notifications to a notification daemon"; - platforms = platforms.unix; - maintainers = teams.gnome.members; + homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; + maintainers = teams.gnome.members; + mainProgram = "notify-send"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index ba554065cfc71..1319a8eedf87f 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.1.0"; + version = "13-2.1.1"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-DpvPmBvpx5pWDlx6T3Kp82ALi6FjOO549Exd8tWXDIk="; + sha256 = "sha256-195WNTTdXHHPbQg2Ipwa3v/qPEeAtehvZa2OC1egoFo="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index 6b616a61d5170..30c7af9ccc564 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; + mainProgram = "libpostal_data"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 0a710d648fbfc..fc85f5375918b 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -85,7 +85,8 @@ in stdenv.mkDerivation rec { homepage = "https://rockdaboot.github.io/libpsl/"; changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; license = licenses.mit; - platforms = platforms.unix; maintainers = [ maintainers.c0bw3b ]; + mainProgram = "psl"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index ddaa6ae3e1d4d..afc2313df7a34 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced calculator library"; homepage = "http://qalculate.github.io"; - maintainers = with maintainers; [ gebner doronbehar ]; license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner doronbehar ]; + mainProgram = "qalc"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix index 71d78a8b8e590..647e4c188a050 100644 --- a/pkgs/development/libraries/libroxml/default.nix +++ b/pkgs/development/libraries/libroxml/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://www.libroxml.net/"; description = "This library is minimum, easy-to-use, C implementation for xml file parsing"; + homepage = "https://www.libroxml.net/"; license = licenses.lgpl3; - platforms = platforms.unix; maintainers = with maintainers; [ mpickering ]; + mainProgram = "roxml"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index b093544138417..6ef67af4b1946 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; + mainProgram = "rsvg-convert"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index a0248e774b7d4..0594e9e6e20bf 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with lib; { + description = "Implementation of the rsync remote-delta algorithm"; homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; + mainProgram = "rdiff"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 95e2c69e4c7ba..b04012cec28bc 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { description = "A library for storing and retrieving passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = lib.licenses.lgpl21Plus; + mainProgram = "secret-tool"; inherit (glib.meta) platforms maintainers; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index e231fb0ed6eee..07025b26eea08 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.icecast.org"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming ]; + mainProgram = "shout"; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d50851e5832d..3dde703853580 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0="; + sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 3be758c906f1a..9acbaa4790630 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; + homepage = "https://developers.yubico.com/libu2f-host"; license = with licenses; [ gpl3Plus lgpl21Plus ]; + mainProgram = "u2f-host"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 9261d1b81bacd..bb49ad4472cf4 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; license = licenses.isc; - platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + mainProgram = "jshn"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 12f7f982c1df0..92b8a99c72d90 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index a58f816e8afaf..e7add08871a6c 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; + homepage = "https://github.com/Netflix/vmaf"; changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; - platforms = platforms.unix; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; + mainProgram = "vmaf"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index e0ee94faf0d48..82f5614458f0b 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -32,13 +32,12 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" + "-DDISABLE_WERROR=ON" # Required since v4.2.0 "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - postInstall = '' rm -r ${placeholder "out"}/share/libwebsockets-test-server ''; @@ -63,21 +62,6 @@ let }; in { - libwebsockets_3_1 = generic { - sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; - version = "3.1.0"; - }; - - libwebsockets_3_2 = generic { - version = "3.2.2"; - sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; - }; - - libwebsockets_4_2 = generic { - version = "4.2.1"; - sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; - }; - libwebsockets_4_3 = generic { version = "4.3.1"; sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8="; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7bcc62af6ec8b..5c632009beef0 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ primeos ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 539fca7456ba1..6578a86e35b1b 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; + mainProgram = "xkbcli"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 43c96027d08bd..8ba48e15f2260 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Extract Cell Data From Excel xls files"; homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; - platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + mainProgram = "xls2csv"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index 7f314410667f9..d0fc1cfd9fbd1 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; + homepage = "https://developers.yubico.com/libykneomgr"; license = licenses.bsd3; + mainProgram = "ykneomgr"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 1d6a94a828a08..38dd0d04e6723 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -5,7 +5,6 @@ , lib , bc-soci , sqlite -, boost , stdenv }: @@ -31,12 +30,13 @@ stdenv.mkDerivation rec { bc-soci sqlite - boost ]; nativeBuildInputs = [ cmake ]; - # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + cmakeFlags = [ + "-DENABLE_STATIC=NO" # Do not build static libraries + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables + ]; meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/development/libraries/lmdb/bin-ext.patch new file mode 100644 index 0000000000000..2d5af99772c0e --- /dev/null +++ b/pkgs/development/libraries/lmdb/bin-ext.patch @@ -0,0 +1,21 @@ +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index 612484e..2e6b562 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -27,6 +27,7 @@ CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) + LDLIBS = + SOLIBS = + SOEXT = .so ++BINEXT = + prefix = /usr/local + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin +@@ -49,7 +50,7 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) + mkdir -p $(DESTDIR)$(libdir) + mkdir -p $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(mandir)/man1 +- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done ++ for f in $(IPROGS); do cp $$f$(BINEXT) $(DESTDIR)$(bindir); done + for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done + for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done + for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 0a3515db26225..a8b5da5b56da4 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab }: +{ lib, stdenv, fetchFromGitLab, windows }: stdenv.mkDerivation rec { pname = "lmdb"; @@ -14,17 +14,20 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - patches = [ ./hardcoded-compiler.patch ]; + patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; patchFlags = [ "-p3" ]; outputs = [ "bin" "out" "dev" ]; + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; + makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ] - ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; + ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so" + ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index ef55541ed777c..96be84ee2a7e9 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost gtest zlib ]; - doCheck = true; - postPatch = '' - substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + substituteInPlace src/test/CMakeLists.txt \ + --replace "add_subdirectory(gtest)" "" ''; + doCheck = true; + checkPhase = '' runHook preCheck LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/include/pkgconfig $out/lib/ + cp $src/src/contrib/include/*h $out/include/lucene++/ ''; meta = { diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 7a227e57560d1..1805de0264cea 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C library for reading and writing Matlab MAT files"; + homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; - platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = "http://matio.sourceforge.net/"; + mainProgram = "matdump"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix index 2ad77b2d2fd83..6504d99af3e93 100644 --- a/pkgs/development/libraries/md4c/default.nix +++ b/pkgs/development/libraries/md4c/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/mity/md4c"; description = "Markdown parser made in C"; longDescription = '' MD4C is Markdown parser implementation in C, with the following features: @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "Unicode"). See more details below. - Permissive license: MD4C is available under the MIT license. ''; + homepage = "https://github.com/mity/md4c"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "md2html"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 2d9c559bcba83..bb5bc566bc1d6 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,33 +1,21 @@ -{ alsa-lib -, bctoolbox +{ bctoolbox , bzrtp , cmake -, doxygen , fetchFromGitLab , ffmpeg , glew , gsm -, intltool , lib -, libGL -, libGLU , libX11 , libXext -, libXv -, libmatroska , libopus -, libpcap , libpulseaudio -, libtheora -, libupnp , libv4l , libvpx , ortp -, pkg-config , python3 , qtbase , qtdeclarative -, SDL , speex , srtp , stdenv @@ -59,9 +47,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - doxygen - intltool - pkg-config python3 qtbase qtdeclarative @@ -73,28 +58,19 @@ stdenv.mkDerivation rec { bzrtp ortp - # Vendored by BC but we use upstream, might cause problems - libmatroska - - alsa-lib ffmpeg glew - gsm - libGL - libGLU libX11 libXext - libXv - libopus - libpcap libpulseaudio - libtheora - libupnp libv4l - libvpx - SDL speex srtp + + # Optional + gsm # GSM audio codec + libopus # Opus audio codec + libvpx # VP8 video codec ]; strictDeps = true; @@ -104,6 +80,7 @@ stdenv.mkDerivation rec { "-DENABLE_QT_GL=ON" # Build necessary MSQOGL plugin for Linphone desktop "-DCMAKE_C_FLAGS=-DGIT_VERSION=\"v${version}\"" "-DENABLE_STRICT=NO" # Disable -Werror + "-DENABLE_UNIT_TESTS=NO" # Do not build test executables ]; NIX_LDFLAGS = "-lXext"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 17f537b4d8734..83a96175cba55 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AqZ7tsNZw2Djgyo1JBJbT/c3eQVyEn6r3CT6DQLD/B8="; }; - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ mediastreamer openh264 ]; # Do not build static libraries diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index e9779cf0a054f..8b5753b3aca99 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -19,8 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The official C client library for MongoDB"; - homepage = "https://github.com/mongodb/mongo-c-driver"; + homepage = "http://mongoc.org"; license = licenses.asl20; + mainProgram = "mongoc-stat"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 49a93abd7fb07..2bc86edef70ac 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; license = licenses.mit; + mainProgram = "nanocat"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 2e8a997299f1b..b798320c69135 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; + mainProgram = "ndpiReader"; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 243dfa44d5b37..f4897331c938d 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -67,15 +67,15 @@ let in stdenv.mkDerivation rec { pname = "opencl-clang"; - version = "unstable-2021-06-22"; + version = "unstable-2022-03-16"; inherit passthru; src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; - rev = "fd68f64b33e67d58f6c36b9e25c31c1178a1962a"; - sha256 = "sha256-q1YPBb/LY67iEuQx1fMUQD/I7OsNfobW3yNfJxLXx3E="; + rev = "bbdd1587f577397a105c900be114b56755d1f7dc"; + sha256 = "sha256-qEZoQ6h4XAvSnJ7/gLXBb1qrzeYa6Jp6nij9VFo8MwQ="; }; patches = [ diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 445188bd0d9bc..b2a555bd263e7 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -2,27 +2,28 @@ stdenv.mkDerivation rec { pname = "pe-parse"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; }; nativeBuildInputs = [ cmake ]; doInstallCheck = true; installCheckPhase = '' - $out/bin/dump-pe ../test/assets/example.exe + $out/bin/dump-pe ../tests/assets/example.exe ''; meta = with lib; { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ arturcygan ]; + mainProgram = "dump-pe"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 5547e492a65be..3e22483eb07f5 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.03.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-cox4upTXWlX2tjVdT72qb0mTTZYWvljl5nmpz9CYDh4="; + sha256 = "sha256-gT+0uQ572mPfUyBcVIYCuucoiHpg9ASKrk29mxkn3v8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index ba35a55d9207b..e700a5f9f11b2 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; - license = with lib.licenses; [ gpl3 ]; homepage = "https://precice.org/"; - platforms = lib.platforms.unix; + license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ Scriptkiddi ]; + mainProgram = "binprecice"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix index df15e73f73cf9..5f03a425dcc0c 100644 --- a/pkgs/development/libraries/presage/default.nix +++ b/pkgs/development/libraries/presage/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; }) ./fixed-cppunit-detection.patch + # fix gcc11 build + (fetchpatch { + name = "presage-0.9.1-gcc11.patch"; + url = "https://build.opensuse.org/public/source/openSUSE:Factory/presage/presage-0.9.1-gcc11.patch?rev=3f8b4b19c99276296d6ea595cc6c431f"; + sha256 = "sha256-pLrIFXvJHRvv4x9gBIfal4Y68lByDE3XE2NZNiAXe9k="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 8251a17a83c6e..2593c04fa158c 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; + mainProgram = "nad2bin"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 6867940d1f23c..130f681d84967 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -48,9 +48,10 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; + homepage = "https://developers.google.com/protocol-buffers/"; license = lib.licenses.bsd3; + mainProgram = "protoc"; platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index ad587f0f58398..af4fcf30153c5 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; + mainProgram = "rnnoise_demo"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index fb847b83fe958..8afb0d0441830 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , writeScript , rocm-comgr }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { hash = "sha256-SFWEGKffhuiTE7ICbkElVV5cldXu4Xbwvjb6LiNmijA="; }; + patches = [ + # Enable support for gfx8 again + # See the upstream issue: https://github.com/RadeonOpenCompute/ROCm/issues/1659 + # And the arch patch: https://github.com/rocm-arch/rocm-arch/pull/742 + (fetchpatch { + url = "https://raw.githubusercontent.com/John-Gee/rocm-arch/d6812d308fee3caf2b6bb01b4d19fe03a6a0e3bd/rocm-opencl-runtime/enable-gfx800.patch"; + hash = "sha256-59jFDIIsTTZcNns9RyMVWPRUggn/bSlAGrky4quu8B4="; + }) + ]; + prePatch = '' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 9c19638d3f406..26bf783f4486e 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.0.2"; + version = "5.1.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; + hash = "sha256-O7q3uTjspO/rZ2+8+g7pRfBXsCRaEr4DZxEqABHbOeY="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DAMD_OPENCL_PATH=${src}" "-DROCCLR_PATH=${rocclr}" + "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; dontStrip = true; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index d16966d213089..9eb9218addafe 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-MGm7YmnoFNk7VsxsbsUgSD9Y5r1OBm6Ycg3wXNme8EI="; + hash = "sha256-IP5ylfUXOFkw9+Frfh+tNaZ83ozAbOK9kO2AzFVzzWk="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index e6e35f9b2c421..918626d04c9de 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.6"; + version = "1.3.12"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; + sha256 = "1n1bak4s67cfizh8j5wpf05kfdcjvwqaca4rq9qys25z52bbpn9f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix deleted file mode 100644 index 9333d5cdfe89c..0000000000000 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ stdenv, lib, config, fetchFromGitHub -, cmake -, glog, gflags, gtest -, protobuf, snappy -, python, future, six, python-protobuf, numpy, pydot -, eigen -, doxygen -, useCuda ? (config.cudaSupport or false), cudaPackages ? {} -, useCudnn ? (config.cudnnSupport or false) -, useOpenmp ? false, openmp ? null -, useOpencv3 ? true, opencv3 ? null -, useLeveldb ? false, leveldb ? null -, useLmdb ? true, lmdb ? null -, useRocksdb ? false, rocksdb ? null -, useZeromq ? false, zeromq ? null -, useMpi ? false, mpi ? null -# TODO: distributed computations -#, useGloo ? false -#, useNccl ? false -#, useNnpack ? false -}: - -let - inherit (cudaPackages) cudatoolkit cudnn; -in - -assert useCuda -> cudatoolkit != null; -assert useCudnn -> (useCuda && cudnn != null); -assert useOpencv3 -> opencv3 != null; -assert useLeveldb -> leveldb != null; -assert useLmdb -> lmdb != null; -assert useRocksdb -> rocksdb != null; -assert useZeromq -> zeromq != null; -assert useMpi -> mpi != null; - -let - # Third party modules that caffe2 holds as git submodules. - # Download them and create symlinks from caffe2/third_party. - installExtraSrc = extra: '' - rmdir "third_party/${extra.dst}" - ln -s "${extra.src}" "third_party/${extra.dst}" - ''; - - cub = { - src = fetchFromGitHub { - owner = "NVlabs"; - repo = "cub"; - rev = "v1.7.4"; - sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; - }; - dst = "cub"; - }; - - pybind11 = { - src = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11"; - rev = "86e2ad4f77442c3350f9a2476650da6bee253c52"; - sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz"; - }; - dst = "pybind11"; - }; - - ccVersion = lib.getVersion stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "caffe2"; - version = "0.8.1"; - src = fetchFromGitHub { - owner = "caffe2"; - repo = "caffe2"; - rev = "v${version}"; - sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8"; - }; - - nativeBuildInputs = [ cmake doxygen gtest ]; - outputs = [ "bin" "out" ]; - propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle - - buildInputs = [ glog gflags protobuf snappy eigen ] - ++ lib.optional useCuda cudatoolkit - ++ lib.optional useCudnn cudnn - ++ lib.optional useOpenmp openmp - ++ lib.optional useOpencv3 opencv3 - ++ lib.optional useLeveldb leveldb - ++ lib.optional useLmdb lmdb - ++ lib.optional useRocksdb rocksdb - ++ lib.optional useZeromq zeromq - ; - propagatedBuildInputs = [ numpy future six python-protobuf pydot ]; - - patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [ - ./fix_compilation_on_gcc7.patch - ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; - - cmakeFlags = [ "-DBUILD_TEST=OFF" - "-DBUILD_PYTHON=ON" - ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}'' - ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}'' - ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}'' - ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}'' - ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}'' - ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}'' - ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}'' - ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}'' - "-DUSE_GLOO=OFF" - "-DUSE_NNPACK=OFF" - "-DUSE_NCCL=OFF" - "-DUSE_REDIS=OFF" - "-DUSE_FFMPEG=OFF" - ] - ++ lib.optional useCuda [ - "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}" - "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ]; - - preConfigure = '' - ${installExtraSrc cub} - ${installExtraSrc pybind11} - # XXX hack - export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE" - ''; - - postInstall = '' - moveToOutput "bin" "$bin" - mkdir -p $out/lib/${python.libPrefix} - ln -s $out/ $out/${python.sitePackages} - ''; - - doCheck = false; - - meta = { - homepage = "https://caffe2.ai/"; - description = "A new lightweight, modular, and scalable deep learning framework"; - longDescription = '' - Caffe2 aims to provide an easy and straightforward way for you to experiment - with deep learning and leverage community contributions of new models and - algorithms. You can bring your creations to scale using the power of GPUs in the - cloud or to the masses on mobile with Caffe2's cross-platform libraries. - ''; - platforms = with lib.platforms; linux; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ yuriaisaka ]; - # fails to compile with - # error: invalid conversion from 'const char*' to 'char*' - # TODO: Remove usage of python2, protobuf overwrite - broken = true; - }; -} diff --git a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch deleted file mode 100644 index f319f20233a21..0000000000000 --- a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc -index dd4fded..5995e8a 100644 ---- a/caffe2/operators/recurrent_network_op.cc -+++ b/caffe2/operators/recurrent_network_op.cc -@@ -1,4 +1,4 @@ --#include "recurrent_network_op.h" -+#include "caffe2/operators/recurrent_network_op.h" - #include "caffe2/core/workspace.h" - - namespace caffe2 { -diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h -index 55328e5..ea898bc 100644 ---- a/caffe2/operators/recurrent_network_op.h -+++ b/caffe2/operators/recurrent_network_op.h -@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> { - USE_OPERATOR_CONTEXT_FUNCTIONS; - - bool RunOnDevice() override { -- const auto t = -- OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0]; -+ const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0); -+ const auto t = t0.template data<int32_t>()[0]; - auto& og = Input(1); - auto* g = Output(0); - -diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h -index f2c0a33..642343f 100644 ---- a/caffe2/queue/queue_ops.h -+++ b/caffe2/queue/queue_ops.h -@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> { - name(operator_def.output().Get(0)) {} - - bool RunOnDevice() override { -- const auto capacity = -- OperatorBase::template GetSingleArgument<int>("capacity", 1); -- const auto numBlobs = -- OperatorBase::template GetSingleArgument<int>("num_blobs", 1); -+ const auto capacity = GetSingleArgument("capacity", 1); -+ const auto numBlobs = GetSingleArgument("num_blobs", 1); - const auto enforceUniqueName = -- OperatorBase::template GetSingleArgument<int>( -- "enforce_unique_name", false); -+ GetSingleArgument("enforce_unique_name", false); - const auto fieldNames = - OperatorBase::template GetRepeatedArgument<std::string>("field_names"); - CAFFE_ENFORCE_EQ(this->OutputSize(), 1); diff --git a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch b/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch deleted file mode 100644 index d908cb6ba80b2..0000000000000 --- a/pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h -index bd06681..00172b7 100644 ---- a/caffe2/perfkernels/cvtsh_ss_bugfix.h -+++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h -@@ -1,10 +1,36 @@ -+/** -+ * Copyright (c) 2016-present, Facebook, Inc. -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ - #pragma once - --#if defined(__APPLE__) && (__clang_major__ < 8) -+// Apple clang was fixed in 8.1 -+#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1))) -+#define __APPLE_NEED_FIX 1 -+#endif -+ -+// Regular clang was fixed in 3.9 -+#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9) -+#define __CLANG_NEED_FIX 1 -+#endif -+ -+#if __APPLE_NEED_FIX || __CLANG_NEED_FIX - - #include <emmintrin.h> - --// This version of apple clang has a bug that _cvtsh_ss is not defined, see -+// This version of clang has a bug that _cvtsh_ss is not defined, see - // https://reviews.llvm.org/D16177 - static __inline float - __attribute__((__always_inline__, __nodebug__, __target__("f16c"))) -@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a) - return r[0]; - } - --#endif // defined(__APPLE__) && (__clang_major__ < 8) -+#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX -+ -+#undef __APPLE_NEED_FIX -+#undef __CLANG_NEED_FIX - - #ifdef _MSC_VER - diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 0d8bafffb44f8..fd89ede1efb9a 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' Cliquer is a set of C routines for finding cliques in an arbitrary weighted graph. @@ -31,8 +29,11 @@ stdenv.mkDerivation rec { It is designed with the aim of being efficient while still being flexible and easy to use. ''; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; + downloadPage = src.meta.homepage; # autocliquer license = licenses.gpl2Plus; maintainers = teams.sage.members; + mainProgram = "cl"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index c956eae4f7100..c5426ed67fc7f 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; + homepage = "https://github.com/sagemath/FlintQS"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; + mainProgram = "QuadraticSieve"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 82237ef143410..1a1f3475c3531 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; meta = with lib; { - homepage = "http://drobilla.net/software/serd"; description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + homepage = "http://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; + mainProgram = "serdi"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index ea1bb4936834f..9255889c6943c 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -44,8 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An advanced font engine"; + homepage = "https://graphite.sil.org/"; + license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; + mainProgram = "gr2fonttest"; platforms = platforms.unix; - license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index fe32076858a94..53d69a7e549d9 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "slsh"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index b29095f7e1991..b03a7cc072287 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { description = "A program and library for changing the tempo, pitch and playback rate of audio"; homepage = "https://www.surina.net/soundtouch/"; license = licenses.lgpl21Plus; - platforms = platforms.all; maintainers = with maintainers; [ orivej ]; + mainProgram = "soundstretch"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 6d973f36c02ba..e1472b594a40c 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -1,24 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, cmake } : +{ stdenv, lib, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { pname = "spglib"; - version = "1.16.3"; + version = "1.16.5"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { - owner = "atztogo"; + owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk="; + sha256 = "sha256-BbqyL7WJ/jpOls1MmY7VNCN+OlF6u4uz/pZjMAqk87w="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + checkTarget = "check"; doCheck = true; meta = with lib; { description = "C library for finding and handling crystal symmetries"; - homepage = "https://atztogo.github.io/spglib/"; + homepage = "https://spglib.github.io/spglib/"; + changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index ebb887ffa0177..73ce1c35f505f 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -2,7 +2,7 @@ let archiveVersion = import ./archive-version.nix lib; - mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; version = "3.38.2"; @@ -20,7 +20,7 @@ let installPhase = "install -Dt $out/bin ${makeTarget}"; meta = with lib; { - inherit description homepage; + inherit description homepage mainProgram; downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; @@ -34,11 +34,13 @@ in makeTarget = "sqldiff"; description = "A tool that displays the differences between SQLite databases"; homepage = "https://www.sqlite.org/sqldiff.html"; + mainProgram = "sqldiff"; }; sqlite-analyzer = mkTool { pname = "sqlite-analyzer"; makeTarget = "sqlite3_analyzer"; description = "A tool that shows statistics about SQLite databases"; homepage = "https://www.sqlite.org/sqlanalyze.html"; + mainProgram = "sqlite3_analyzer"; }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 391424ee2c93d..499532092f026 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; + mainProgram = "stxxl_tool"; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 11918d76da6c0..7163f24815c52 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; + homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; license = "as-is"; - + mainProgram = "enhance"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index f561efb473c59..a10ad67b23d92 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -9,17 +9,19 @@ , gtksourceview4 , icu , pkg-config +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "tepl"; - version = "6.00.0"; + version = "6.0.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; + sha256 = "J08Fa75V8wpq5EQq0i8VfQTTphtWjZC8hRF7txMgIME="; }; nativeBuildInputs = [ @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { ninja gobject-introspection pkg-config + gtk-doc + docbook-xsl-nons ]; buildInputs = [ diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 9ac026ee94b81..8cd0faf486730 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight and robust POSIX compliant regexp matching library"; homepage = "https://laurikari.net/tre/"; - platforms = lib.platforms.unix; license = lib.licenses.bsd2; + mainProgram = "agrep"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index fbf5a71bb4b1a..a389d204a83ea 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -19,15 +19,21 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.8"; + version = "0.17.9"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-s3zeWJxw5ohUtsv4NZGKcdP8khEYzIXycbBrAzdnVoU="; + sha256 = "sha256-FEmWjJVmKKckC30zULGI/mZ3VNtirnweZq2gKh/Y5VE="; }; + patches = [ + # Hardcode absolute paths to libraries so that consumers + # do not need to set LD_LIBRARY_PATH themselves. + ./hardcode-paths.patch + ]; + nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -57,6 +63,21 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + # Substitute the path to this derivation in the patch we apply. + substituteInPlace src/umockdev-wrapper \ + --subst-var-by 'LIBDIR' "''${!outputLib}/lib" + ''; + + preCheck = '' + # Our patch makes the path to the `LD_PRELOAD`ed library absolute. + # When running tests, the library is not yet installed, though, + # so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p "$out/lib" + ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0" + ''; + meta = with lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/development/libraries/umockdev/hardcode-paths.patch new file mode 100644 index 0000000000000..91f1e928ec609 --- /dev/null +++ b/pkgs/development/libraries/umockdev/hardcode-paths.patch @@ -0,0 +1,69 @@ +diff --git a/meson.build b/meson.build +index 2ed9027..1f6bbf2 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,6 +38,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) + + conf.set('PACKAGE_NAME', meson.project_name()) + conf.set_quoted('VERSION', meson.project_version()) ++conf.set_quoted('LIBDIR', get_option('prefix') / get_option('libdir')) + + # glibc versions somewhere between 2.28 and 2.34 + if cc.has_function('__fxstatat', prefix: '#include <sys/stat.h>') +@@ -148,7 +149,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', + + if g_ir_compiler.found() + umockdev_typelib = custom_target('UMockdev-1.0 typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', 'libumockdev.so.0', '@INPUT@'], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', get_option('prefix') / get_option('libdir') / 'libumockdev.so.0', '@INPUT@'], + input: hacked_gir, + output: 'UMockdev-1.0.typelib', + install: true, +diff --git a/src/config.vapi b/src/config.vapi +index 5269dd0..a2ec46d 100644 +--- a/src/config.vapi ++++ b/src/config.vapi +@@ -2,5 +2,6 @@ + namespace Config { + public const string PACKAGE_NAME; + public const string VERSION; ++ public const string LIBDIR; + } + +diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala +index 8434d32..68c7f8e 100644 +--- a/src/umockdev-record.vala ++++ b/src/umockdev-record.vala +@@ -435,7 +435,7 @@ main (string[] args) + preload = ""; + else + preload = preload + ":"; +- Environment.set_variable("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); ++ Environment.set_variable("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); + + try { + root_dir = DirUtils.make_tmp("umockdev.XXXXXX"); +diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala +index 9a1ba10..6df2522 100644 +--- a/src/umockdev-run.vala ++++ b/src/umockdev-run.vala +@@ -95,7 +95,7 @@ main (string[] args) + preload = ""; + else + preload = preload + ":"; +- Environment.set_variable ("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); ++ Environment.set_variable ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); + + var testbed = new UMockdev.Testbed (); + +diff --git a/src/umockdev-wrapper b/src/umockdev-wrapper +index 6ce4dcd..706c49a 100755 +--- a/src/umockdev-wrapper ++++ b/src/umockdev-wrapper +@@ -1,5 +1,5 @@ + #!/bin/sh + # Wrapper program to preload the libumockdev library, so that test programs can + # set $UMOCKDEV_DIR for redirecting sysfs and other queries to a test bed. +-exec env LD_PRELOAD=libumockdev-preload.so.0:$LD_PRELOAD "$@" ++exec env LD_PRELOAD=@LIBDIR@/libumockdev-preload.so.0:$LD_PRELOAD "$@" + diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 28eea0525176d..c39fdb03e8960 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { - homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. API documentation is available on uriparser website. ''; + homepage = "https://uriparser.github.io/"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ bosu ]; + mainProgram = "uriparse"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 9957eccd42671..c342ee4d70d36 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openssl, pe-parse }: stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.4"; + version = "1.0.8"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; }; - patches = [ - # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions - (fetchpatch { - url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; - sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; - }) - ]; - - cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ pe-parse openssl gtest ]; + checkInputs = [ gtest ]; + buildInputs = [ pe-parse openssl ]; doCheck = true; checkPhase = "test/uthenticode_test"; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 196081aa58c1d..067e47b3a2ff0 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 2fc57b87ab3bf..0ae563f8b1933 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k"; + sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA="; }; postPatch = '' diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 9a8bee561c11e..c8706c737b12b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.14.3"; + version = "1.14.4"; outputs = [ "out" "installedTests" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "CDqTQQ8dOatOxDKR+HiVQgSJKxH6ZstskKdR84U/870="; + sha256 = "///X0inMi9Znuhjn9n0HlVLa5/kFWpKorKS8RY9WeYM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 5f2557514804c..187e6900aa07d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { + description = "XML Security Library in C based on libxml2"; homepage = "http://www.aleksey.com/xmlsec"; downloadPage = "https://www.aleksey.com/xmlsec/download.html"; - description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; + mainProgram = "xmlsec1"; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index b115cf7b675b8..99163ae5dc6cb 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "zlog-chk-conf"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cc179f0b9463d..10744653ca1cb 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -240,7 +240,9 @@ with prev; ]; }); - luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: { buildInputs = [ pkgs.glibc.out ]; }); + luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { + buildInputs = [ pkgs.glibc.out ]; + }); luazip = prev.lib.overrideLuarocks prev.luazip (drv: { buildInputs = [ diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 800b1c1e531a8..cee30da45c9e4 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -313,6 +313,7 @@ with self; meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; buildInputs = [ js_of_ocaml-ppx ]; propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + patches = [ ./incr_dom_jsoo_4_0.patch ]; }; incr_map = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch b/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch new file mode 100644 index 0000000000000..4e7a45ce96d36 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/incr_dom_jsoo_4_0.patch @@ -0,0 +1,24 @@ +diff --git a/src/js_misc.ml b/src/js_misc.ml +index 65f7b44..bfef103 100644 +--- a/src/js_misc.ml ++++ b/src/js_misc.ml +@@ -28,17 +28,11 @@ type rows_or_columns = + [@@deriving sexp, bin_io, variants, compare] + + let innerHeight () = +- Js.Optdef.case +- Dom_html.window##.innerHeight +- (fun () -> Dom_html.document##.documentElement##.clientHeight) +- Fn.id ++ Dom_html.window##.innerHeight + ;; + + let innerWidth () = +- Js.Optdef.case +- Dom_html.window##.innerWidth +- (fun () -> Dom_html.document##.documentElement##.clientWidth) +- Fn.id ++ Dom_html.window##.innerWidth + ;; + + let element_is_in_viewport (elt : Dom_html.element Js.t) = diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 12a92c5be399c..60a07d30d0596 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "3.1.1"; + version = "3.2.0"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; nativeBuildInputs = [ ocaml findlib opaline eliom ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "sha256:1fm0vvccmjib9yj5m2760vhzb4z3392swlprp51az53g3vk4q218"; + sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7"; }; meta = { diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 864d0caba3959..d1f6325f85073 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.3"; + version = "0.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wlcrs"; repo = "python-afsapi"; - rev = version; - hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY="; + rev = "refs/tags/${version}"; + hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 9f6828fd63292..bc977348a71ca 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-F0t4vVxi4KUUtIZc8FJD9+2qf1XA58haFfjmHwAQaWA="; + hash = "sha256-JJ5wrjXazq0+6f4nccLRYaAgTg0d39REXmPHVchDzaE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index fc62525915e91..1b926074cbaaa 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.3.4"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk="; + hash = "sha256-QLHM7M3x0QjTTzKNngsNioEzpPh4qG1ntEtSkHQPlfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix new file mode 100644 index 0000000000000..9f8f81e2fca85 --- /dev/null +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, importlib-metadata +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "aiolimiter"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mjpieters"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4wByVZoOLhrXFx9oK19GBmRcjGoJolQ3Gwx9vQV/n8s="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + toml + ]; + + patches = [ + # Switch to poetry-core, https://github.com/mjpieters/aiolimiter/pull/77 + (fetchpatch { + name = "switch-to-peotry-core.patch"; + url = "https://github.com/mjpieters/aiolimiter/commit/84a85eff42621b0daff8fcf6bb485db313faae0b.patch"; + sha256 = "sha256-xUfJwLvMF2Xt/V1bKBFn/fjn1uyw7bGNo9RpWxtyr50="; + }) + ]; + + postPatch = '' + substituteInPlace tox.ini \ + --replace " --cov=aiolimiter --cov-config=tox.ini --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ + "aiolimiter" + ]; + + meta = with lib; { + description = "Implementation of a rate limiter for asyncio"; + homepage = "https://github.com/mjpieters/aiolimiter"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 50f8ed56404bc..2990659556cbb 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,13 +16,18 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c="; + hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0="; }; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50'] + "test_msg_instantiation" + ]; + pythonImportsCheck = [ "aioslimproto" ]; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 42f37e130994f..5584f2bd6719a 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -17,7 +17,7 @@ , nose , nose-timer , mock -, python_magic +, python-magic , codecov , coverage , qt5 @@ -70,7 +70,7 @@ buildPythonPackage rec { nose-timer pyperclip pyqt5 - python_magic + python-magic ]; inherit doCheck; diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index f116cef3dc759..2f7afc1137565 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.66"; + version = "0.0.67"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo="; + hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 31629eab9d674..a65d681a17b35 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7t4NV1udBq3tK7czuKYUsQ+9tLahFM8DlUUBT3d6bco="; + hash = "sha256-aniLMNKfEqlVkniS2mSCaeXIOc0EC4zOR59kiGTNUWk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d32441a989c6a..47ecddb0447f4 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-VhlsRd5IN8zF6aUU5Ji/ULkdecOpR+egU3vhYpi+KL8="; + hash = "sha256-LCgY/eOtRulnMeYt96ZYI8vPyyM+jxjlkxTd8Cmnfe0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 0e6f26700bcd4..2e44fa4e243c7 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "5.7.0"; + version = "5.7.1"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y="; + sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE="; }; postPatch = '' @@ -78,6 +78,7 @@ buildPythonPackage { meta = with lib; { description = "Radically simple IT automation"; homepage = "https://www.ansible.com"; + changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index b9b29a7167abc..e6cd183d41342 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-RWdY7tzT5wDVjAn1QIkQm8b5lIo++VzktsYZxn8taeg="; + hash = "sha256-wJEipAlqBsP2tgsRDVDe1ZtiEg1uhpP+1P1VGU7tBBw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 69e6519b32c3d..b656b19478575 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2022-02-03"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; - hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; + rev = "v${version}"; + hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM="; }; postPatch = '' @@ -32,13 +32,6 @@ buildPythonPackage rec { "--asyncio-mode=strict" ]; - disabledTests = [ - # https://github.com/aio-libs/async-lru/issues/341 - "test_alru_cache_deco" - "test_alru_cache_fn_called" - "test_close" - ]; - pythonImportsCheck = [ "async_lru" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index f2fc5b855c109..c80c2646b7d4c 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.28.0"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY="; + sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 7e59d9c8bc958..00eb71e3d7daf 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aurorapy"; - version = "0.2.6"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "energievalsabbia"; repo = pname; rev = version; - hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE="; + hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 2b3b1e4ce8c17..9698b445eb873 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulate JSON-like data with NumPy-like idioms"; - homepage = "https://github.com/scikit-hep/awkward-1.0"; + homepage = "https://github.com/scikit-hep/awkward"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 9f4a6dcb45a04..c888a99f26418 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "venth"; repo = pname; - rev = version; - hash = "sha256-T3AmPCOSeu7gvl57aHjnviy5iQAKlWy85fUOVecFRFc="; + rev = "refs/tags/${version}"; + hash = "sha256-/cOJ8k8YuwTGEXrNuPFAYvDyDKERMJf3o3nRkDLkrJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 1f1a2dde37627..d36a1b985c716 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -1,27 +1,30 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , msrest -, msrestazure , azure-common -, azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.0.0"; + version = "6.0.1"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-RpmYeF6LRKqu0KrjNAFAaOGxyfPuK+TImOumP+FPX2w="; + sha256 = "sha256-PPkQmUoBkJ8Su7h9G2/t8dVy/PT3uCYZjlf70fnY2vU="; }; propagatedBuildInputs = [ msrest - msrestazure azure-common - azure-mgmt-nspkg + azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; @@ -29,9 +32,11 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.msi" ]; + meta = with lib; { description = "This is the Microsoft Azure MSI Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-msi"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 5baf84c1c394d..f2426586d6a0c 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -5,17 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "4.1.1"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-9xF2TIAzydmviOwfveA0ZGP7Qj0HWLL6rXp4V4IDS6A="; + hash = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; }; propagatedBuildInputs = [ @@ -23,13 +26,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - azure-mgmt-nspkg ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; + pythonImportsCheck = [ + "azure.mgmt.recoveryservicesbackup" + ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 761472b631fff..8ac4330b45a80 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "21.0.0"; + version = "21.1.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-y9J/UhxwtA/YO/Y88XsStbwD5ecNwrbnpxtevYuQDQM="; + sha256 = "sha256-UpZa3jHNBZ/qKxUT1l/mFgRuQz3g5YPc9cnJvr8+vWk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index a0864529177fc..0fd1ca89f08c3 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -3,22 +3,25 @@ , azure-core , buildPythonPackage , fetchPypi -, futures ? null , isodate -, isPy3k , msrestazure +, pythonOlder +, six +, typing-extensions , uamqp }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.6.0"; + version = "7.6.1"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU="; + hash = "sha256-wqt+uWKVklP2AxiQN9PeuOFUixtZuBUIUhN+WZBYrBI="; }; propagatedBuildInputs = [ @@ -26,16 +29,15 @@ buildPythonPackage rec { azure-core isodate msrestazure + six + typing-extensions uamqp - ] ++ lib.optionals (!isPy3k) [ - futures ]; - # has no tests + # Tests require dev-tools doCheck = false; - # python2 will fail due to pep 420 - pythonImportsCheck = lib.optionals isPy3k [ + pythonImportsCheck = [ "azure.servicebus" ]; diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index d2b6d06c4cdbb..5fa4c6323169a 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -7,6 +7,7 @@ , tzdata , hypothesis , pytestCheckHook +, fetchpatch }: buildPythonPackage rec { @@ -22,7 +23,25 @@ buildPythonPackage rec { sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; }; + # Make sure test data update patch applies + prePatch = '' + substituteInPlace tests/data/zoneinfo_data.json --replace \"2020a\" \"2021a\" + ''; + patches = [ + # Update test suite's test data to zoneinfo 2022a + # https://github.com/pganssle/zoneinfo/pull/115 + (fetchpatch { + name = "backports-zoneinfo-2022a-update-test-data1.patch"; + url = "https://github.com/pganssle/zoneinfo/pull/115/commits/837e2a0f9f1a1332e4233f83e3648fa564a9ec9e.patch"; + sha256 = "196knwa212mr0b7zsh8papzr3f5mii87gcjjjx1r9zzvmk3g3ri0"; + }) + (fetchpatch { + name = "backports-zoneinfo-2022a-update-test-data2.patch"; + url = "https://github.com/pganssle/zoneinfo/pull/115/commits/9fd330265b177916d6182249439bb40d5691eb58.patch"; + sha256 = "1zxa5bkwi8hbnh4c0qv72wv6vdp5jlxqizfjsc05ymzvwa99cf75"; + }) + (substituteAll { name = "zoneinfo-path"; src = ./zoneinfo.patch; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index d4ced793f8304..6ba700cc6e24a 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -12,7 +12,7 @@ , oauth2client , ply , pytest -, python_magic +, python-magic , requests }: @@ -40,7 +40,7 @@ buildPythonPackage rec { lxml oauth2client ply - python_magic + python-magic requests # pytest really is a runtime dependency # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix index a685c01fbc0fc..555caa6033ca2 100644 --- a/pkgs/development/python-modules/bond-api/default.nix +++ b/pkgs/development/python-modules/bond-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bond-api"; - version = "0.1.16"; + version = "0.1.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prystupa"; repo = "bond-api"; rev = "v${version}"; - sha256 = "1nqf090b14nd7an2n776mb37yskddfnihmas2fy56pxclwvwqr9n"; + hash = "sha256-fuVYyDy3fG+XobFe2GCzMWRWPk8VDPLU4RHJzcF5MLg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brunt/default.nix b/pkgs/development/python-modules/brunt/default.nix new file mode 100644 index 0000000000000..1c11e92b2346d --- /dev/null +++ b/pkgs/development/python-modules/brunt/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "brunt"; + version = "1.2.0"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "e704627dc7b9c0a50c67ae90f1d320b14f99f2b2fc9bf1ef0461b141dcf1bce9"; + }; + + postPatch = '' + sed -i '/--cov/d' setup.cfg + ''; + + propagatedBuildInputs = [ + aiohttp + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # tests require Brunt hardware + doCheck = false; + + pythonImportsCheck = [ "brunt" ]; + + meta = { + description = "Unofficial Python SDK for Brunt"; + homepage = "https://github.com/eavanvalkenburg/brunt-api"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 49b36a5c6582c..535c46fc40aa6 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,24 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core -, passlib , dnspython +, fetchFromGitHub , loguru -, toml +, passlib +, poetry-core , pytestCheckHook +, pythonOlder +, toml }: buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.36"; + version = "1.6.40"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "mpenning"; repo = pname; rev = version; - sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; + hash = "sha256-2j1AlCIwTxIjotZ0fSt1zhsgPfJTqJukZ6KQvh74NJ8="; }; postPatch = '' @@ -45,17 +48,19 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" ]; - pythonImportsCheck = [ "ciscoconfparse" ]; + pythonImportsCheck = [ + "ciscoconfparse" + ]; meta = with lib; { - description = - "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; license = licenses.gpl3Only; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8f66e8551edf5..eafc0c3f427d2 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pCqhSpZfX3u9vJ8Oy1yyicagBQYK5+jBVCEab0TnGA4="; + hash = "sha256-b07WygCR3IhRgyt7u1ipyyK4MM3TNeLW04WoZJ2eQZk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8ee898b445e72..cbbb130a6aa71 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.1"; + version = "9.2.2"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-OGdnrRFfx2LMMsw6giPC+4izWX603cYbpKHuslj4Gng="; + hash = "sha256-vEnhoVxn/p4CNzfHFM1cKaQ3ESsJx5U4+Lz4/LDCtao="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 02aeec5bfcc3c..7cf41e9fcbdc5 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - pythonImportCheck = [ "contexttimer" ]; + pythonImportsCheck = [ "contexttimer" ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 3475001a58b7d..1782598efd819 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.14"; + version = "9.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-l+mTqiQPuPJfGbEVSILpCTlxAka0GeCgIXjMG4Vs82o="; + sha256 = "sha256-qXS/hgF2qKUtTfo9UZ5KBa9N0PHJqKA8SC/vgE46LmA="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index f40ba374d0345..12cbdf0a210df 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a009862a0bc3f41f2b1a1b1f80d6aeedb3a17ed77d598da09f5a1bd93e970b3c"; + sha256 = "sha256-+nlk9xG3mOCS4xHzp54J/V+he7HNMg1aMgFeTFTrMHA="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 31e9da795d3a7..5485372a1e1c4 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.18.1"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q="; + sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 4fbc0f06fc43b..5d44866da0eb1 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "v${version}"; - sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk="; + sha256 = "sha256-LMwvIwbP/nRFby295ur6QTgyXLLJ8ip30V9bti27qKQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix new file mode 100644 index 0000000000000..a6c184e2d67e2 --- /dev/null +++ b/pkgs/development/python-modules/django-tastypie/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, python-mimeparse +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-tastypie"; + version = "0.14.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-tastypie"; + repo = pname; + rev = "v${version}"; + hash = "sha256-O/aVi8BshOZmg9WQxrFlBEOXfgyqJKVK/QlEFG3Edqs="; + }; + + propagatedBuildInputs = [ + python-dateutil + python-mimeparse + ]; + + # Tests requires a Django instance + doCheck = false; + + pythonImportsCheck = [ + "tastypie" + ]; + + meta = with lib; { + description = "Utilities and helpers for writing Pylint plugins"; + homepage = "https://github.com/django-tastypie/django-tastypie"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index eefda80f18e4e..01c1b8353ba88 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -3,7 +3,7 @@ , fetchPypi , django , pillow -, python_magic +, python-magic }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; }; - propagatedBuildInputs = [ pillow python_magic ]; + propagatedBuildInputs = [ pillow python-magic ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 0f30113ba2ffc..1c86e3bccf6bd 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; - rev = "v${version}"; - sha256 = "17jldscmsq5lwp3pnjlxg56k3vfpr7rj4qbcbzkzhphifrfgm729"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fg0gkI+01xIt8LQmNmRzkzd4AObg/99x34y5NclMtDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 8b51d829c8df1..7627c0505ac20 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.11.1"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; repo = "dunamai"; - rev = "v${version}"; - sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SyHml8TIcqU7KQE4IuTZbp+Jktao7ReJHQyHV8wKeWg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 5d45c4dc5ce38..f5a28fa383999 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.1"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; + hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix index b4311eeb7cd68..047f2849d046b 100644 --- a/pkgs/development/python-modules/flametree/default.nix +++ b/pkgs/development/python-modules/flametree/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "flametree"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "Flametree"; - rev = "v${version}"; - sha256 = "1ynrk1ivl1vjiga0ayl8k89vs5il7i0pf9jz2ycn771c47szwk4x"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix new file mode 100644 index 0000000000000..101a3ef53d6d9 --- /dev/null +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, pydantic +, freezegun +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gcal-sync"; + version = "0.7.1"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "gcal_sync"; + rev = version; + hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gcal_sync" ]; + + meta = { + description = "Python library for syncing Google Calendar to local storage"; + homepage = "https://github.com/allenporter/gcal_sync"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 88a2c49e0520b..6820927542621 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.7.0"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-Us3SCkrBPL3v9YCOQ7ceF3neCUZkJTrchYsvCRSX84Y="; + hash = "sha256-JaAiAAf0zIJDXXl3zb4UE9XpmjZ8KQiEcZJm1ps+efA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index aef938e8266d9..879ffbf7123a1 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.2.2"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ="; + sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix new file mode 100644 index 0000000000000..6e785d0c9a284 --- /dev/null +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, git +, hatchling +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "hatch-vcs"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "hatch_vcs"; + inherit version; + sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + hatchling + setuptools-scm + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hatch_vcs" + ]; + + meta = with lib; { + description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions"; + homepage = "https://github.com/ofek/hatch-vcs"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 18a5f0cd82aac..57797ff8acd15 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,26 +1,30 @@ -{ buildPythonPackage +{ lib +, bokeh +, buildPythonPackage +, colorcet , fetchPypi -, lib -, param -, numpy -, pyviz-comms , ipython +, matplotlib , notebook +, numpy , pandas -, matplotlib -, bokeh -, scipy , panel -, colorcet +, param +, pythonOlder +, pyviz-comms +, scipy }: buildPythonPackage rec { pname = "holoviews"; - version = "1.14.8"; + version = "1.14.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; + hash = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo="; }; propagatedBuildInputs = [ @@ -35,12 +39,14 @@ buildPythonPackage rec { # tests not fully included with pypi release doCheck = false; - pythonImportsCheck = [ "holoviews" ]; + pythonImportsCheck = [ + "holoviews" + ]; meta = with lib; { description = "Python data analysis and visualization seamless and simple"; homepage = "http://www.holoviews.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 213c382be0bd8..49535fd333988 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -10,17 +10,21 @@ , pyquery , requests , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "howdoi"; version = "2.0.19"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gleitz"; repo = pname; rev = "v${version}"; - sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q"; + hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I="; }; propagatedBuildInputs = [ @@ -46,6 +50,16 @@ buildPythonPackage rec { # AssertionError: "The... "test_get_text_with_one_link" "test_get_text_without_links" + # Those tests are failing in the sandbox + # OSError: [Errno 24] Too many open files + "test_answers" + "test_answers_bing" + "test_colorize" + "test_json_output" + "test_missing_pre_or_code_query" + "test_multiple_answers" + "test_position" + "test_unicode_answer" ]; pythonImportsCheck = [ @@ -54,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Instant coding answers via the command line"; - homepage = "https://pypi.python.org/pypi/howdoi"; + homepage = "https://github.com/gleitz/howdoi"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 63625bd7ee60b..a962f86854f2a 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -4,31 +4,44 @@ , colorama , fetchFromGitHub , funcparserlib +, hy , pytestCheckHook +, python , pythonOlder , rply +, testers +, toPythonApplication +, hyDefinedPythonPackages ? python-packages: [ ] /* Packages like with python.withPackages */ }: buildPythonPackage rec { pname = "hy"; - version = "1.0a3"; + version = "1.0a4"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hylang"; repo = pname; rev = version; - sha256 = "1dqw24rvsps2nab1pbjjm1c81vrs34r4kkk691h3xdyxnv9hb84b"; + sha256 = "sha256-MBzp3jqBg/kH233wcgYYHc+Yg9GuOaBsXIfjFDihD1E="; }; + # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 + HY_VERSION = version; + propagatedBuildInputs = [ colorama funcparserlib - rply - ] ++ lib.optionals (pythonOlder "3.9") [ + rply # TODO: remove on the next release + ] + ++ lib.optionals (pythonOlder "3.9") [ astor - ]; + ] + # for backwards compatibility with removed pkgs/development/interpreters/hy + # See: https://github.com/NixOS/nixpkgs/issues/171428 + ++ (hyDefinedPythonPackages python.pkgs); checkInputs = [ pytestCheckHook @@ -43,10 +56,22 @@ buildPythonPackage rec { pythonImportsCheck = [ "hy" ]; + passthru = { + tests.version = testers.testVersion { + package = hy; + command = "hy -v"; + }; + # also for backwards compatibility with removed pkgs/development/interpreters/hy + withPackages = python-packages: (toPythonApplication hy).override { + hyDefinedPythonPackages = python-packages; + }; + }; + meta = with lib; { - description = "Python to/from Lisp layer"; - homepage = "https://github.com/hylang/hy"; + description = "A LISP dialect embedded in Python"; + homepage = "https://hylang.org/"; + changelog = "https://github.com/hylang/hy/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab mazurel nixy thiagokokada ]; }; } diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix new file mode 100644 index 0000000000000..46ed096486b0f --- /dev/null +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hyrule"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hylang"; + repo = pname; + rev = version; + sha256 = "sha256-sqS5vOcbln+Vfv/Ji/8rJ4GTQpXIuhgf+MukjV0Kkuw="; + }; + + propagatedBuildInputs = [ + hy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Some tests depends on hy on PATH + preCheck = "PATH=${hy}/bin:$PATH"; + + pythonImportsCheck = [ "hyrule" ]; + + meta = with lib; { + description = "Hyrule is a utility library for the Hy programming language"; + homepage = "https://github.com/hylang/hyrule"; + changelog = "https://github.com/hylang/hylure/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index a63754f0c09e3..404731e22a9a5 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.54.0"; + version = "0.55.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; + hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 6b6f7e452b279..cc957ac156aa1 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.9.24"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GNVX04f0kU+vpzmBO5FyvD+L2cA26Tv1iajg67cwS7o="; + hash = "sha256-uOsCCiy7RxRmac/jHGS7Ln1kmdBJxJPWQYuXFvXHRYM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix new file mode 100644 index 0000000000000..646ffec6552ea --- /dev/null +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "insteon-frontend-home-assistant"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf"; + }; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "insteon_frontend" ]; + + meta = { + description = "The Insteon frontend for Home Assistant"; + homepage = "https://github.com/teharris1/insteon-panel"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 9cedf7c4d284c..f6459c13e706a 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -9,9 +10,11 @@ buildPythonPackage rec { version = "3.0.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; + hash = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; }; checkInputs = [ @@ -25,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; - license = licenses.lgpl3Only; + license = licenses.lgpl3Plus; maintainers = teams.determinatesystems.members; }; } diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b33ec2759b561..8894fbaf21ff3 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -1,43 +1,35 @@ -{ lib -, buildPythonPackage +{ buildPythonPackage , fetchPypi -, python -, nose -, pytest -, mock -, ipython , ipykernel +, ipython , jupyterlab-widgets +, lib +, nbformat +, pytestCheckHook , traitlets -, notebook , widgetsnbextension }: buildPythonPackage rec { pname = "ipywidgets"; version = "7.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo="; + hash = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo="; }; - # Tests are not distributed - # doCheck = false; - - buildInputs = [ nose pytest mock ]; propagatedBuildInputs = [ ipython ipykernel jupyterlab-widgets traitlets - notebook + nbformat widgetsnbextension ]; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + checkInputs = [ pytestCheckHook ]; meta = { description = "IPython HTML widgets for Jupyter"; diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 2da21db1eb145..56cd051ecf4cb 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -5,6 +5,7 @@ , sphinx , ipywidgets , pythonOlder +, nbconvert }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2"; }; - propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 2cb7d06b646a7..dd8368676d1b7 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -10,6 +10,7 @@ , jinja2 , tornado , pyzmq +, ipykernel , ipython_genutils , traitlets , jupyter_core @@ -62,6 +63,7 @@ buildPythonPackage rec { ]; checkInputs = [ + ipykernel pytestCheckHook pytest-tornasync requests diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index 2e7d561cf6e00..ea79a5f453f23 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -4,12 +4,16 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder , regex }: buildPythonPackage rec { pname = "karton-autoit-ripper"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; @@ -27,14 +31,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "autoit-ripper==1.0.0" "autoit-ripper" \ - --replace "malduck==3.1.0" "malduck>=3.1.0" \ - --replace "regex==2020.2.20" "regex>=2020.2.20" + --replace "autoit-ripper==" "autoit-ripper>=" \ + --replace "malduck==" "malduck>=" \ + --replace "regex==" "regex>=" ''; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "karton.autoit_ripper" ]; + + pythonImportsCheck = [ + "karton.autoit_ripper" + ]; meta = with lib; { description = "AutoIt script ripper for Karton framework"; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index ca2703389b306..8195632bdfd4e 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , karton-core , pytestCheckHook -, python_magic +, python-magic , pythonOlder }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet karton-core - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index ef97439cdc86a..54f71fe2ec2be 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "linkify-it-py"; - version = "1.0.3"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsutsu3"; repo = pname; - rev = "v${version}"; - hash = "sha256-1QqfqFdTEdZr02jQnmHmvw3fgnC/ktsfALyhtkGSXoY="; + rev = "refs/tags/v${version}"; + hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk="; }; propagatedBuildInputs = [ uc-micro-py ]; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 1b757a144ccf5..7d5998da2e96b 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "malduck"; - version = "4.1.0"; + version = "4.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "04d8bhzax9ynbl83hif9i8gcs29zrvcay2r6n7mcxiixlxcqciak"; + rev = "refs/tags/v${version}"; + hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM="; }; propagatedBuildInputs = [ @@ -43,7 +45,9 @@ buildPythonPackage rec { # Project has no tests. They will come with the next release doCheck = false; - pythonImportsCheck = [ "malduck" ]; + pythonImportsCheck = [ + "malduck" + ]; meta = with lib; { description = "Helper for malware analysis"; diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index c1a7c8985b78d..178ed4b8fc06b 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -6,7 +6,7 @@ , decorator , http-ece , python-dateutil -, python_magic +, python-magic , pytz , requests , six @@ -37,7 +37,7 @@ buildPythonPackage rec { decorator http-ece python-dateutil - python_magic + python-magic pytz requests six diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f2745bf3f6f83..9adbbf5e5d3c9 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.0.4"; + version = "9.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0="; + hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meater-python/default.nix b/pkgs/development/python-modules/meater-python/default.nix new file mode 100644 index 0000000000000..219af570dfe87 --- /dev/null +++ b/pkgs/development/python-modules/meater-python/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "meater-python"; + version = "0.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-86XJmKOc2MCyU9v0UAZsPCUL/kAXywOlQOIHaykNF1o="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "meater" + ]; + + meta = with lib; { + description = "Library for the Apption Labs Meater cooking probe"; + homepage = "https://github.com/Sotolotl/meater-python"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index d5fe44b37e746..bba7b1884176f 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -5,7 +5,7 @@ , isPy3k , decorator , http-parser -, python_magic +, python-magic , urllib3 , pytestCheckHook , pytest-mock @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator http-parser - python_magic + python-magic urllib3 ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index a329d5ab9e514..6fa1728deea3b 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.6"; + version = "1.22.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; + hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 9c96f71c2813e..6579185861fe1 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,9 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, - async_generator, traitlets, nbformat, nest-asyncio, jupyter-client, - pytest, xmltodict, nbconvert, ipywidgets +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, async_generator +, traitlets +, nbformat +, nest-asyncio +, jupyter-client +, pytestCheckHook +, xmltodict +, nbconvert +, ipywidgets }: -buildPythonPackage rec { +let nbclient = buildPythonPackage rec { pname = "nbclient"; version = "0.6.2"; format = "setuptools"; @@ -15,14 +25,26 @@ buildPythonPackage rec { hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; }; - doCheck = false; # Avoid infinite recursion - checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + # circular dependencies if enabled by default + doCheck = false; + + checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + passthru.tests = { + check = nbclient.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; license = licenses.bsd3; maintainers = [ maintainers.erictapen ]; }; -} +}; +in nbclient diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 69aa660f1425d..9b85586f7d9be 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -1,25 +1,19 @@ -{ lib +{ beautifulsoup4 +, bleach , buildPythonPackage +, defusedxml , fetchPypi -, pytestCheckHook -, glibcLocales -, entrypoints -, bleach -, mistune -, nbclient +, ipywidgets , jinja2 -, pygments -, traitlets -, jupyter_core , jupyterlab-pygments -, nbformat -, ipykernel +, lib +, markupsafe +, mistune +, nbclient , pandocfilters -, tornado -, jupyter-client -, defusedxml +, pyppeteer +, pytestCheckHook , tinycss2 -, beautifulsoup4 }: buildPythonPackage rec { @@ -42,37 +36,38 @@ buildPythonPackage rec { substituteAllInPlace ./nbconvert/exporters/templateexporter.py ''; - checkInputs = [ pytestCheckHook glibcLocales ]; - propagatedBuildInputs = [ - entrypoints bleach mistune jinja2 pygments traitlets - jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml tinycss2 beautifulsoup4 - nbclient + beautifulsoup4 + bleach + defusedxml + jinja2 jupyterlab-pygments + markupsafe + mistune + nbclient + pandocfilters + tinycss2 ]; - # disable preprocessor tests for ipython 7 - # see issue https://github.com/jupyter/nbconvert/issues/898 preCheck = '' - export LC_ALL=en_US.UTF-8 - HOME=$(mktemp -d) + export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - "--ignore=nbconvert/preprocessors/tests/test_execute.py" - # can't resolve template paths within sandbox - "--ignore=nbconvert/tests/base.py" - "--ignore=nbconvert/tests/test_nbconvertapp.py" + checkInputs = [ + ipywidgets + pyppeteer + pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: Support for bleach <5 will be removed in a future version of nbconvert + "-W ignore::DeprecationWarning" + ]; disabledTests = [ + # Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution) "test_export" - "test_webpdf_without_chromium" - #"test_cell_tag_output" - #"test_convert_from_stdin" - #"test_convert_full_qualified_name" + "test_webpdf_with_chromium" ]; # Some of the tests use localhost networking. diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 6f85a797c3743..9fbb336c3867a 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-gHgFEDUji43vTBZp5FLK90H+D44sfH2AuCc7Gu2T1pg="; + sha256 = "sha256-aCDw3JwX8LVrJp3jYvuYQ3ycRHjSnWU0n1LdTjV08VA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/notify-events/default.nix b/pkgs/development/python-modules/notify-events/default.nix new file mode 100644 index 0000000000000..97d888ae23ce5 --- /dev/null +++ b/pkgs/development/python-modules/notify-events/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "notify-events"; + version = "1.1.3"; + + format = "setuptools"; + + src = fetchPypi { + pname = "notify_events"; + inherit version; + sha256 = "e63ba935c3300ff7f48cba115f7cb4474906e83c2e9b60b95a0881eb949701e7"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "notify_events" ]; + + meta = { + description = "Python client for Notify.Events"; + homepage = "https://github.com/notify-events/python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 8848691079636..84003ce30be56 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,15 +1,26 @@ -{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, treelog +, stringly +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "nutils"; version = "7.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6"; - }; + disabled = pythonOlder "3.7"; - pythonImportChecks = [ "nutils" ]; + src = fetchFromGitHub { + owner = "evalf"; + repo = "nutils"; + rev = "refs/tags/v${version}"; + hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; + }; propagatedBuildInputs = [ numpy @@ -17,16 +28,23 @@ buildPythonPackage rec { stringly ]; - checkInputs = [ coverage ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nutils" + ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; + disabledTestPaths = [ + # AttributeError: type object 'setup' has no attribute '__code__' + "tests/test_cli.py" + ]; meta = with lib; { description = "Numerical Utilities for Finite Element Analysis"; homepage = "https://www.nutils.org/"; license = licenses.mit; - maintainers = [ maintainers.Scriptkiddi ]; + maintainers = with maintainers; [ Scriptkiddi ]; }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 72565e55419c8..6700b88479db8 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { postPatch = '' # https://github.com/ocrmypdf/OCRmyPDF/issues/933 substituteInPlace setup.cfg \ - --replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319" + --replace "pdfminer.six!=20200720,>=20191110,<=20220319" "pdfminer.six!=20200720,>=20191110" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index b4d1c8fb88af5..96d4416ec9650 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -1,24 +1,25 @@ { lib , stdenv -, buildPythonPackage , asn1crypto -, fetchPypi +, buildPythonPackage +, fetchFromGitHub , openssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oscrypto"; - version = "1.2.1"; + version = "1.3.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x"; - }; + disabled = pythonOlder "3.7"; - testSources = fetchPypi { - inherit version; - pname = "oscrypto_tests"; - sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks"; + src = fetchFromGitHub { + owner = "wbond"; + repo = pname; + rev = version; + hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; propagatedBuildInputs = [ @@ -26,21 +27,26 @@ buildPythonPackage rec { openssl ]; - preCheck = '' - tar -xf ${testSources} - mv oscrypto_tests-${version} tests - - # remove tests that require network - sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "oscrypto" ]; + pythonImportsCheck = [ + "oscrypto" + ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # Tests require network access + "TLSTests" + "TrustListTests" + ]; + meta = with lib; { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c5680c5c8a363..421d53b5a8812 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -14,14 +14,23 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.10.3"; + version = "2.10.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo="; + sha256 = "sha256-PS5lC2gSzm0WCr/3AdbvRDTsl5NLE+lc8a09pw/7XFg="; }; + patches = [ + # Fix usage of dsa keys + # https://github.com/paramiko/paramiko/pull/1606/ + (fetchpatch { + url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; + sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + }) + ]; + propagatedBuildInputs = [ bcrypt cryptography @@ -51,15 +60,6 @@ buildPythonPackage rec { "paramiko" ]; - patches = [ - # Fix usage of dsa keys - # https://github.com/paramiko/paramiko/pull/1606/ - (fetchpatch { - url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; - sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; - }) - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { @@ -72,6 +72,6 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 449ea4f7fd778..b52106af285ba 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, cryptography +, charset-normalizer +, pytestCheckHook +, ocrmypdf +}: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20220319"; + version = "20220506"; disabled = !isPy3k; @@ -10,10 +18,10 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ="; + sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA="; }; - propagatedBuildInputs = [ chardet cryptography ]; + propagatedBuildInputs = [ charset-normalizer cryptography ]; postInstall = '' for file in $out/bin/*.py; do @@ -27,8 +35,16 @@ buildPythonPackage rec { substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} ''; + pythonImportsCheck = [ "pdfminer" ]; + checkInputs = [ pytestCheckHook ]; + passthru = { + tests = { + inherit ocrmypdf; + }; + }; + meta = with lib; { description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index e98122d2f399b..c24886d7101c9 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.0.21"; + version = "0.0.22"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4="; + hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index e582ad1a44623..2098a1d10cf63 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.84"; + version = "2.1.85"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tjPjLzNOO/PUU6EItLYyQw+KPekIwboTBn98T8wHpHw="; + hash = "sha256-ABRidGtJikMIHItT21MJdiIqpA26IUN1aFMNyRVKyDA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4f8dc93c671ec..2366d94ed8c91 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.47"; + version = "8.12.48"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vv1gXS9UYOHfIRcIW2U7s4MiKV7GWOasqvycl2hn1SI="; + sha256 = "sha256-rwaB+/6foHITdq2bcp53Ll0gvyz1DZ3Yyi8L3Xjp8M4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 18d4fec6c1685..396583b9ee4ed 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -13,27 +13,25 @@ , pytest-asyncio , pytestCheckHook , python-dateutil +, pythonOlder , pytz , semver }: buildPythonPackage rec { pname = "plugwise"; - version = "0.17.8"; + version = "0.18.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZNlkdubB6E5ak+EaXsEBGa1xpm5ms4Rp3DG/M4/+WOg="; + sha256 = "sha256-kpEs5LvUz61Wm2IUI6sNXx2R+vtuHq1Y6aaj+zLrr+Q="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "aiohttp==3.8.0" "aiohttp>=3.8.0" - ''; - propagatedBuildInputs = [ aiohttp async-timeout @@ -54,16 +52,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "plugwise" ]; + pythonImportsCheck = [ + "plugwise" + ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "Python module for Plugwise Smiles, Stretch and USB stick"; - longDescription = '' - XKNX is an asynchronous Python library for reading and writing KNX/IP - packets. It provides support for KNX/IP routing and tunneling devices. - ''; homepage = "https://github.com/plugwise/python-plugwise"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index b662452d8a0b4..bdc484fd1bb3c 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RHCP5SakizURg5MwD96Bxs/NvoTdPSCKWVYt5m4meLA="; + hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index 9839ea9dd2338..3b630f719054d 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "proglog"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "13diln950wk6nnn4rpmzx37rvrnpa7f803gwygiwbq1q46zwri6q"; + sha256 = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ="; }; propagatedBuildInputs = [ tqdm ]; diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch new file mode 100644 index 0000000000000..bb34dff0b5a68 --- /dev/null +++ b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch @@ -0,0 +1,22 @@ +From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@tutanota.com> +Date: Wed, 27 Apr 2022 21:49:12 -0600 +Subject: [PATCH] Patching GIRepository + +--- + protonvpn_nm_lib/__init__.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/protonvpn_nm_lib/__init__.py b/protonvpn_nm_lib/__init__.py +index e69de29..00b95f4 100644 +--- a/protonvpn_nm_lib/__init__.py ++++ b/protonvpn_nm_lib/__init__.py +@@ -0,0 +1,5 @@ ++import gi ++gi.require_version('GIRepository', '2.0') ++from gi.repository import GIRepository ++repo = GIRepository.Repository.get_default() ++repo.prepend_search_path('@networkmanager_path@') +-- +2.35.1 + diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 9f12f220cfe9c..44e4b8e237d31 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, substituteAll , distro , jinja2 , keyring @@ -9,18 +10,19 @@ , pygobject3 , pyxdg , systemd +, networkmanager }: buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4="; + sha256 = "sha256-yV3xeIyPc2DJj5DOa5PA1MHt00bjJ/Y9zZK77s/XRAA="; }; propagatedBuildInputs = [ @@ -33,7 +35,15 @@ buildPythonPackage rec { systemd ]; - # Project has a dummy test. + patches = [ + (substituteAll { + src = ./0001-Patching-GIRepository.patch; + networkmanager_path = "${networkmanager}/lib/girepository-1.0"; + }) + ]; + + # Checks cannot be run in the sandbox + # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; pythonImportsCheck = [ "protonvpn_nm_lib" ]; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 92338d92531b9..e697683b9b847 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -3,7 +3,7 @@ , fetchPypi , requests , websocket-client -, python_magic +, python-magic , cryptography , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket-client python-magic ]; preCheck = '' export PUSHBULLET_API_KEY="" diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index b97d51496521c..c9e2ff020f827 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -7,6 +7,7 @@ , nbconvert , markdown , isPy3k +, ipykernel }: buildPythonPackage rec { @@ -21,7 +22,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ mock pkgs.glibcLocales ]; - propagatedBuildInputs = [ matplotlib nbconvert markdown ]; + propagatedBuildInputs = [ ipykernel matplotlib nbconvert markdown ]; # fails due to trying to run CSS as test doCheck = false; diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 531624781b40f..6685d245833f3 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.1"; + version = "0.5.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "snjoetw"; repo = pname; - rev = version; - sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr"; + rev = "refs/tags/${version}"; + hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "canary" ]; + pythonImportsCheck = [ + "canary" + ]; meta = with lib; { description = "Python package for Canary Security Camera"; diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix new file mode 100644 index 0000000000000..3b6d24d6168d5 --- /dev/null +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-nextbusnext"; + version = "0.1.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ViViDboarder"; + repo = "py_nextbus"; + rev = "v${version}"; + hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "py_nextbus" ]; + + meta = { + description = "Minimalistic Python client for the NextBus public API"; + homepage = "https://github.com/ViViDboarder/py_nextbus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 56e5636622b81..336e637edef00 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -3,31 +3,34 @@ , fetchFromGitHub , fetchpatch , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyahocorasick"; - version = "1.4.1"; + version = "1.4.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; rev = version; - sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5"; + hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo="; }; - patches = [ - # Use proper temporary directory on Hydra - (fetchpatch { - url = "https://github.com/WojciechMula/pyahocorasick/commit/b6549e06f3cced7ffdf4d1b587cd7de12041f495.patch"; - sha256 = "sha256-v3J/0aIPOnBhLlJ18r/l7O0MckqLOCtcmqIS9ZegaSI="; - }) + checkInputs = [ + pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "unittests.py" + ]; - pytestFlagsArray = [ "unittests.py" ]; - pythonImportsCheck = [ "ahocorasick" ]; + pythonImportsCheck = [ + "ahocorasick" + ]; meta = with lib; { description = "Python module implementing Aho-Corasick algorithm"; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 32462707cb6ed..7d38d99c6965a 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "11.0.0"; + version = "12.1.1"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY="; + sha256 = "sha256-lUWiKs2tyWYD9214eMbqF7rxMoJgz1YMiHyMEqrUyCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 8d37521f3266c..8523fd96f6436 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aioresponses +, async-timeout , buildPythonPackage , fetchFromGitHub , pytest-aiohttp @@ -10,20 +11,21 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "87"; + version = "91"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; - rev = "v${version}"; - sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8="; + rev = "refs/tags/v${version}"; + hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ="; }; propagatedBuildInputs = [ aiohttp + async-timeout ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 9cfd0fe3c9cf7..cc2b726a64a93 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.10.17"; + version = "1.10.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "v${version}"; - hash = "sha256-V0LgHFvGvJqDHmyXJNb0sJjRuqGGDZpV467XDmdFg5k="; + hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix index 28bb1a2c4c0a2..b59f2ad4fe9eb 100644 --- a/pkgs/development/python-modules/pyevilgenius/default.nix +++ b/pkgs/development/python-modules/pyevilgenius/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyevilgenius"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3"; + sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index d85a173322400..41e3c95a0410f 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -1,30 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, gevent , click , colorama , configparser , distro +, fetchFromGitHub +, gevent , jinja2 , paramiko +, pytestCheckHook , python-dateutil +, pythonOlder , pywinrm +, pyyaml , setuptools -, six }: buildPythonPackage rec { pname = "pyinfra"; - version = "2.0.2"; + version = "2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0="; + src = fetchFromGitHub { + owner = "Fizzadar"; + repo = pname; + rev = "v${version}"; + hash = "sha256-frjPxSATvXgeACT4kThoiPu04Ez8bs8FIPdf5PVuiSg="; }; propagatedBuildInputs = [ @@ -37,16 +40,23 @@ buildPythonPackage rec { paramiko python-dateutil pywinrm + pyyaml setuptools - six ]; - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "pyinfra" ]; + disabledTests = [ + # Test requires SSH binary + "test_load_ssh_config" + ]; + meta = with lib; { description = "Python-based infrastructure automation"; longDescription = '' diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 0dc1c5be49c25..ed28f1c75226b 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.16"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc="; + rev = "refs/tags/${version}"; + hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykulersky/default.nix b/pkgs/development/python-modules/pykulersky/default.nix index 520f1fea2698b..83a5b58c7f1cb 100644 --- a/pkgs/development/python-modules/pykulersky/default.nix +++ b/pkgs/development/python-modules/pykulersky/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pykulersky"; - version = "0.5.3"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k="; + sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 61d49bd3ba0db..ca26f11ccb3b5 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage -, coverage , django , factory_boy , fetchFromGitHub -, isPy3k , pylint-plugin-utils , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.2"; - disabled = !isPy3k; + version = "2.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; + hash = "sha256-5xEXjNMkOetRM9NDz0S4DsC6v39YQi34s2s+Fs56hYU="; }; propagatedBuildInputs = [ @@ -27,7 +28,6 @@ buildPythonPackage rec { ]; checkInputs = [ - coverage factory_boy pytestCheckHook ]; @@ -38,6 +38,7 @@ buildPythonPackage rec { "external_factory_boy_noerror" "func_noerror_foreign_key_attributes" "func_noerror_foreign_key_key_cls_unbound" + "test_everything" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index f2bbef2cc8c14..46c12f0d0d07c 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -1,39 +1,46 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, isPy3k -, lib - -# pythonPackages , pylint +, pytestCheckHook +, pythonOlder , toml }: buildPythonPackage rec { pname = "pylint-plugin-utils"; - version = "0.6"; - disabled = !isPy3k; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "1zapmbczxs1phrwbd0yvpfxhljd2pyv4pi9rwggaq38lcnc325s7"; + hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; }; propagatedBuildInputs = [ - pylint toml + pylint + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pylint_plugin_utils" ]; - checkPhase = '' - python tests.py - ''; + # https://github.com/PyCQA/pylint-plugin-utils/issues/26 + doCheck = false; meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; homepage = "https://github.com/PyCQA/pylint-plugin-utils"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index a4725c4781c6b..c855127079773 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { disabledTests = [ "test_multiple_workspaces" + "test_option_overrides_dmypy" ]; checkInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index df258cad930b8..eb19d273459bb 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.3.2"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1"; + sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix new file mode 100644 index 0000000000000..74f0ed630a26e --- /dev/null +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, parameterized +, pycryptodome +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, responses +, setuptools +}: + +buildPythonPackage rec { + pname = "pyrainbird"; + version = "0.4.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jbarrancos"; + repo = pname; + rev = version; + hash = "sha256-uRHknWvoPKPu3B5MbSEUlWqBKwAbNMwsgXuf6PZxhkU="; + }; + + propagatedBuildInputs = [ + pycryptodome + pyyaml + requests + setuptools + ]; + + checkInputs = [ + pytestCheckHook + parameterized + responses + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "datetime" "" + substituteInPlace pytest.ini \ + --replace "--cov=pyrainbird --cov-report=term-missing --pep8 --flakes --mccabe" "" + ''; + + pythonImportsCheck = [ + "pyrainbird" + ]; + + meta = with lib; { + description = "Module to interact with Rainbird controllers"; + homepage = "https://github.com/jbarrancos/pyrainbird/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 6a2ce2af05e29..0c34eb375bb12 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.16"; + version = "2.0.17"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg="; + hash = "sha256-MzbZVG6/+YirgKsfrsSaT6jS0fTq/TBhlduZzgQKU+M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 5baa9e9032159..36e45d9d8695f 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -6,7 +6,7 @@ , httpretty , ijson , poetry-core -, python_magic +, python-magic , pytz , pytestCheckHook , requests-oauthlib @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli ijson - python_magic + python-magic pytz requests-oauthlib ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index da92963875769..9ddbc92125f27 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.1"; + version = "4.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-8595zivZmff0agFiQd5Qyd/T3BDxYcsb4RjA5AWXVNM="; + sha256 = "sha256-RXIFfd4eeRLaDPe6+8jhIN2TI1yz/uDfnvWT95euaIo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index dbd51166a22c5..ee66ea262c63b 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -1,27 +1,28 @@ { lib -, black +, pythonOlder , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, black , python-lsp-server -, pythonOlder +, toml }: buildPythonPackage rec { pname = "python-lsp-black"; - version = "1.1.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; rev = "v${version}"; - sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY="; + sha256 = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; }; checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ black python-lsp-server ]; + propagatedBuildInputs = [ black python-lsp-server toml ]; meta = with lib; { homepage = "https://github.com/python-lsp/python-lsp-black"; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 313524351658a..aeb2d7567790d 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -20,6 +20,7 @@ , pythonOlder , rope , setuptools +, setuptools-scm , stdenv , ujson , yapf @@ -36,7 +37,8 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.3.3"; + version = "1.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -44,13 +46,18 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F8f9NAjPWkm01D/KwFH0oA6nQ3EF4ZVCCckZTL4A35Y="; + sha256 = "sha256-rEfjxHw2NIVIa8RepxLPiXkRFhcGWLzm6w43n60zkFE="; }; postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" + --replace "--cov pylsp --cov test" "" \ + --replace "mccabe>=0.6.0,<0.7.0" "mccabe" + ''; + + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; propagatedBuildInputs = [ @@ -58,6 +65,7 @@ buildPythonPackage rec { pluggy python-lsp-jsonrpc setuptools + setuptools-scm ujson ] ++ lib.optional withAutopep8 autopep8 ++ lib.optional withFlake8 flake8 @@ -79,10 +87,7 @@ buildPythonPackage rec { # pyqt5 is broken on aarch64-darwin ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; - disabledTests = [ - # pytlint output changed - "test_lint_free_pylint" - ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" + disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" # pyqt5 is broken on aarch64-darwin ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion"; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 381ea67138487..a9fa50a11c699 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index e41942317f993..2e35def271025 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.5.2"; + version = "5.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-ZTjh9gtnJwFG2qWH6FBrvLHKsEuTjkcKL6j6Mdos6zo="; + sha256 = "sha256-zsTSz2RHtr4LqqPCkvHcaAw7RvfkHTNDm83OS+SgMUU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix index d7fa18cfba3ef..b2f58f99f6447 100644 --- a/pkgs/development/python-modules/python-trovo/default.nix +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "python-trovo"; - version = "0.1.5"; + version = "0.1.6"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE="; + sha256 = "sha256-g1RDHSNGbGT1G2ej7A8WzyR17FaNPySfsAuKbHddmtQ="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 2c695fc7e05a6..abc90f2a6c7f4 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -3,19 +3,20 @@ , pythonOlder , fetchPypi , aiohttp +, pytest-aiohttp , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.2.1"; + version = "0.3.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e"; + sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62"; }; propagatedBuildInputs = [ @@ -23,6 +24,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-aiohttp pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index e2c48948b9784..ffd7a89dbb0ce 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.32.0"; + version = "2.32.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VSGi93R8O0LGKFBkWMclje64suOqq/Gf2vE2OHXLP5Q="; + sha256 = "sha256-fjahaMetgZaH+IzdyaZSkVbasgc0bqQL+1ae0OJriT0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 45404c107fb1b..f1421e8c98069 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SsSzwuJvDbQ1AzF+q5bjOnFaR6M2UFixtlmk6sgjKOg="; + sha256 = "sha256-/hPDCqTeqEzxfqv8B5wdDzmzzNuXYqOVHX32N/J6nmU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 799271371c7b1..509da93663d0e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.1"; + version = "9.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b6LZJmAyxklvZxvane19dK/kQfbLPjkk29RydiWMZCY="; + hash = "sha256-jfquDFZylrrtYb3PbDmLDy7wHcvM8H2nIv4dRqRvY2U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index 7f726d8ae7f8d..bc90068e66ea6 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyzerproc"; - version = "0.4.10"; + version = "0.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-sfxyHpJzYYwxLsvfJpqI6cC/CKS7Jx0vXSLL3QD9qV4="; + sha256 = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix new file mode 100644 index 0000000000000..2eeb4e81d28eb --- /dev/null +++ b/pkgs/development/python-modules/qnapstats/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, xmltodict +, responses +, python +}: + +buildPythonPackage rec { + pname = "qnapstats"; + version = "0.4.0"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "colinodell"; + repo = "python-qnapstats"; + rev = version; + hash = "sha256-Tzi2QG1Xw12fLVfV49SPJKdz5VdJ4hQMuCHH8gxcOBE="; + }; + + propagatedBuildInputs = [ + requests + xmltodict + ]; + + checkInputs = [ + responses + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests/test-models.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "qnapstats" ]; + + meta = { + description = "Python API for obtaining QNAP NAS system stats"; + homepage = "https://github.com/colinodell/python-qnapstats"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix new file mode 100644 index 0000000000000..768e5f7d007e9 --- /dev/null +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, inflection +, pbr +, tinycss2 +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "qstylizer"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "blambright"; + repo = pname; + rev = version; + sha256 = "sha256-iEMxBpS9gOPubd9O8zpVmR5B7+UZJFkPuOtikO1a9v0="; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + inflection + tinycss2 + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + + preBuild = '' + export PBR_VERSION=${version} + ''; + + meta = with lib; { + description = "Qt stylesheet generation utility for PyQt/PySide "; + homepage = "https://github.com/blambright/qstylizer"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix new file mode 100644 index 0000000000000..860f9461e4438 --- /dev/null +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -0,0 +1,61 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, html5lib +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, urllib3 +}: + +buildPythonPackage rec { + pname = "raincloudy"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vanstinator"; + repo = pname; + rev = version; + hash = "sha256-c6tux0DZY56a4BpuiMXtaqm8+JKNDiyMxrFUju3cp2Y="; + }; + + propagatedBuildInputs = [ + requests + beautifulsoup4 + urllib3 + html5lib + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + postPatch = '' + # https://github.com/vanstinator/raincloudy/pull/60 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" \ + --replace "html5lib==1.0.1" "html5lib" + ''; + + pythonImportsCheck = [ + "raincloudy" + ]; + + disabledTests = [ + # Test requires network access + "test_attributes" + ]; + + meta = with lib; { + description = "Module to interact with Melnor RainCloud Smart Garden Watering Irrigation Timer"; + homepage = "https://github.com/vanstinator/raincloudy"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 597eb37c7560c..3185213123c29 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: +{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }: buildPythonPackage rec { pname = "relatorio"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ genshi lxml - python_magic + python-magic ]; meta = { diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index d2de7dff212f3..c38309f6d8d93 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -24,14 +24,17 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpx requests six ]; + passthru.extras-require = { + httpx = [ httpx ]; + }; + checkInputs = [ pytestCheckHook - ]; + ] ++ passthru.extras-require.httpx; pythonImportsCheck = [ "requests_aws4auth" diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index a5fdf3d547edc..2c12019e9ac7c 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; + hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0="; }; dontConfigure = true; @@ -134,7 +134,8 @@ buildPythonPackage rec { --replace "pdfminer.six >= 20200101" "pdfminer.six" \ --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ --replace "pygmars >= 0.7.0" "pygmars" \ - --replace "license_expression >= 21.6.14" "license_expression" + --replace "license_expression >= 21.6.14" "license_expression" \ + --replace "intbitset >= 2.3.0, < 3.0" "intbitset" ''; # Importing scancode needs a writeable home, and preCheck happens in between diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 073059aec6261..70feaa7108e2d 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { pname = "scrapy"; version = "2.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -92,6 +94,7 @@ buildPythonPackage rec { "test_nested_xpath" "test_flavor_detection" # Requires network access + "AnonymousFTPTestCase" "FTPFeedStorageTest" "FeedExportTest" "test_custom_asyncio_loop_enabled_true" @@ -99,6 +102,7 @@ buildPythonPackage rec { "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 "test_timeout_download_from_spider_nodata_rcvd" + "test_timeout_download_from_spider_server_hangs" # Fails with AssertionError "test_peek_fifo" "test_peek_one_element" diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix new file mode 100644 index 0000000000000..3003dddce6de1 --- /dev/null +++ b/pkgs/development/python-modules/sdds/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sdds"; + version = "0.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pylhc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU="; + }; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "sdds" ]; + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python 3 package to handle SDDS files"; + homepage = "https://pylhc.github.io/sdds/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index d24c8263e9a14..298a2a8915d6b 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = pname; rev = "v${version}"; - sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; + sha256 = "sha256-3QUI3AjouuGa9sWXH97GSvpimVsws3q5Xgq6lls/wBU="; }; preBuild = '' diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index ec3cf592786de..cb3446156bfbc 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -3,6 +3,7 @@ , aresponses , asynctest , backoff +, beautifulsoup4 , buildPythonPackage , docutils , fetchFromGitHub @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.03.3"; + version = "2022.05.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw="; + sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backoff + beautifulsoup4 docutils pytz voluptuous @@ -62,6 +64,8 @@ buildPythonPackage rec { # simplipy/api.py:253: InvalidCredentialsError "test_request_error_failed_retry" "test_update_error" + # ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution] + "test_client_async_from_refresh_token_unknown_error" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index f14bf9330c486..6066407dafd48 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, libiconv +, Foundation +, rustPlatform +, setuptools-rust }: buildPythonPackage rec { pname = "skytemple-rust"; @@ -17,7 +24,7 @@ buildPythonPackage rec { sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); GETTEXT_SYSTEM = true; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 95d162b7f3200..7e7491fe8b6d5 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -2,20 +2,22 @@ , buildPythonPackage , construct , fetchFromGitHub -, isPy3k , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "snapcast"; - version = "2.1.3"; - disabled = !isPy3k; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "happyleavesaoc"; repo = "python-snapcast"; - rev = version; - sha256 = "1jigdccdd7bffszim942mxcwxyznfjx7y3r5yklz3psl7zgbzd6c"; + rev = "refs/tags/${version}"; + hash = "sha256-H41X5bfRRu+uE7eUsmUkONm6hugNs43+O7MvVPH0e+8="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "snapcast" ]; + pythonImportsCheck = [ + "snapcast" + ]; meta = with lib; { description = "Control Snapcast, a multi-room synchronous audio solution"; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index a54fa65d08b74..d317f11dea425 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }: buildPythonPackage rec { pname = "spglib"; - version = "1.16.3"; + version = "1.16.5"; src = fetchPypi { inherit pname version; - sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038"; + sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M="; }; propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose pyyaml ]; + checkInputs = [ pytest pyyaml ]; + + # pytestCheckHook doesn't work + # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' + checkPhase = '' + pytest + ''; + + pythonImportsCheck = [ "spglib" ]; meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; - homepage = "https://atztogo.github.io/spglib"; + homepage = "https://spglib.github.io/spglib/"; + changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 95d54e404471a..2d4328ba3e16e 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { pyzmq ]; + postPatch = '' + substituteInPlace setup.py --replace "ipython>=7.31.1,<8" "ipython" + ''; + # No tests doCheck = false; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index c117cb4990f8b..eaca9e6c7f408 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,16 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, - jedi, pycodestyle, psutil, rope, numpy, scipy, matplotlib, pylint, - keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, - cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, - watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg, - diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, makeDesktopItem +, atomicwrites +, chardet +, cloudpickle +, cookiecutter +, diff-match-patch +, flake8 +, intervaltree +, jedi +, jellyfish +, keyring +, matplotlib +, mccabe +, nbconvert +, numpy +, numpydoc +, psutil +, pygments +, pylint +, pyls-spyder +, pyopengl +, pyqtwebengine +, python-lsp-black +, python-lsp-server +, pyxdg +, pyzmq +, pycodestyle +, qdarkstyle +, qstylizer +, qtawesome +, qtconsole +, qtpy +, rope +, Rtree +, scipy +, spyder-kernels +, textdistance +, three-merge +, watchdog +, pytestCheckHook }: buildPythonPackage rec { pname = "spyder"; version = "5.3.0"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -20,11 +58,44 @@ buildPythonPackage rec { nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; propagatedBuildInputs = [ - intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels - pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server - atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder - flake8 textdistance + atomicwrites + chardet + cloudpickle + cookiecutter + diff-match-patch + flake8 + intervaltree + jedi + jellyfish + keyring + matplotlib + mccabe + nbconvert + numpy + numpydoc + psutil + pygments + pylint + pyls-spyder + pyopengl + pyqtwebengine + python-lsp-black + python-lsp-server + pyxdg + pyzmq + pycodestyle + qdarkstyle + qstylizer + qtawesome + qtconsole + qtpy + rope + Rtree + scipy + spyder-kernels + textdistance + three-merge + watchdog ]; # There is no test for spyder @@ -44,13 +115,8 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py - # The major version bump in watchdog is due to changes in supported - # platforms, not API break. - # https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518 substituteInPlace setup.py \ - --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" \ - --replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0" + --replace "ipython>=7.31.1,<8.0.0" "ipython" ''; postInstall = '' diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index b3621802a0978..d7f07eea073ce 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,16 +14,21 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.26"; + version = "3.26.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-G2Fy9PEYtq0dIWhsgV4HZa5y+wLxcI3CYSgDL6ijkdo="; + hash = "sha256-GK/036zijOSi9IWZSFifXrexY8dyo6cfwWyaF06x82c="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "click-default-group-wheel" "click-default-group" + ''; + propagatedBuildInputs = [ click click-default-group @@ -45,6 +50,6 @@ buildPythonPackage rec { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; license = licenses.asl20; - maintainers = with maintainers; [ meatcar ]; + maintainers = with maintainers; [ meatcar techknowlogick ]; }; } diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 6313f413c6ab7..257c7c276153e 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.4"; + version = "1.6.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8="; + sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c49dd79679d86..b47f3917b9258 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.75.0"; + version = "2.76.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME="; + hash = "sha256-/T/Gk1w7YYmWcZFge2846+SQAFpZC00NQ/vjq6Rd7Kg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index e14c64730a23a..5806b28e34903 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -1,38 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , rich , typing-extensions , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "textual"; - version = "0.1.15"; + version = "0.1.18"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6"; + sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; }; - patches = [ - (fetchpatch { - # v0.1.15 git tag has 0.1.14 in pyproject.toml - name = "version.patch"; - url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch"; - sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp"; - }) + nativeBuildInputs = [ + poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ rich + ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; @@ -40,7 +36,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "textual" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'rich = "^12.3.0"' 'rich = "*"' + ''; + + pythonImportsCheck = [ + "textual" + ]; meta = with lib; { description = "TUI framework for Python inspired by modern web development"; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 139f58660c4cd..fe32af2671336 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.2.1"; + version = "3.3.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rJMEzfgLCcN+6pZXmeDZrAqhzLZTH65Uiqvgm68aJUk="; + hash = "sha256-rc0kq/Ic40UEF81aAPI7fldVTOiugnM03RK/y7YnTPE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 7846525f65fd7..2f093200bf35a 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.2.1"; + version = "2022.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY="; + hash = "sha256-S+xki1Bj+wvKhbl2vRRa8gULyxTsH4fyypkrHj3JwH0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c3a6a4af9e58d..315678b874efa 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.11.2"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; + sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix new file mode 100644 index 0000000000000..46db94782be5c --- /dev/null +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, netmiko +, pytestCheckHook +, python +, pythonOlder +, ttp +}: + +buildPythonPackage rec { + pname = "ttp-templates"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dmulyalin"; + repo = "ttp_templates"; + rev = version; + hash = "sha256-Qx+z/srYgD67FjXzYrc8xtA99n8shWK7yWj/r/ETN2U="; + }; + + propagatedBuildInputs = [ + ttp + ]; + + checkInputs = [ + netmiko + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ttp_templates" + ]; + + pytestFlagsArray = [ + # The other tests requires data which is no part of the source + "test/test_ttp_templates_methods.py" + "test/test_yang_openconfig_lldp.py" + ]; + + meta = with lib; { + description = "Template Text Parser Templates collections"; + homepage = "https://github.com/dmulyalin/ttp_templates"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index a2c815b45e258..bcb6fbd3b06e0 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.8.0"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-RaM2JN2WOHyZY+AxzgQLvhXg6UnevDbSFSR4jFLsYrc="; + rev = "refs/tags/v${version}"; + hash = "sha256-BMRRunPRDW5J/7KU+pr2Uv9Qa6oHBwkA7tsGa5YdzLw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 8e52c5b6e0144..e8cf1edbde5ff 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.14"; + version = "2.8.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Nnwf+hpSpLKlNMmzC0CwHyt/LqR6l/2CH2x20ceuMSk="; + sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE="; }; pythonImportsCheck = [ "dateutil-stubs" ]; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index d3ac7e4932bb1..bbbd791301815 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.7"; + version = "2021.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EdW6BiaBZ5U8zEo+7hksJLQtANKu9FbBYKh5iJPLIIE="; + sha256 = "sha256-QSU6OivwKLaj8XtYdJppLZVa8PdOl13pT29NLTzQHb0="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 5da6ea016801d..c8f49386543a4 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.8"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CzGcfhDdVh98FfVt7DR8MZP9hl9Ovl/x7LAg6vp5O8M="; + hash = "sha256-L8P6T+GFOsmHz1Do1FmeP+RG3VMGT+hqRqQHqY6fwE8="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index ed965cbb8c489..5b1482440ea95 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.6"; + version = "0.10.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aus+17+oaTgVUcd07WqRQuPu2YqD76UQipYy6v1W3NM="; + sha256 = "sha256-pWf+JhSxd9U3rZmmYa3Jv8jFWkb5XmY3Ck7S3RcTNfk="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 3df7f6703a79b..57e64ba97a894 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , isPy3k -, isPy27 , glibcLocales }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.1.2"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; @@ -33,6 +30,6 @@ buildPythonPackage rec { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index d2e221d6e3903..4212de031be84 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,27 +1,31 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "voluptuous"; - version = "0.13.0"; + version = "0.13.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY="; + src = fetchFromGitHub { + owner = "alecthomas"; + repo = pname; + rev = version; + hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; }; checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ + "voluptuous" + ]; - pythonImportsCheck = [ "voluptuous" ]; + pytestFlagsArray = [ + "voluptuous/tests/" + ]; meta = with lib; { description = "Python data validation library"; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ef1e1d1198f7f..615b4e64aa4cd 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -12,7 +12,7 @@ , jsonref , jsonschema , matplotlib -, nbconvert +, nbclient , nbformat , pandas , pathtools @@ -88,9 +88,7 @@ buildPythonPackage rec { jsonref jsonschema matplotlib - # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's - # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488. - nbconvert + nbclient nbformat pandas pydantic diff --git a/pkgs/tools/security/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index 07c1f1e707e40..02a1b050f914d 100644 --- a/pkgs/tools/security/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -1,20 +1,33 @@ { lib +, astroid +, beautifulsoup4 +, buildPythonPackage , fetchFromGitHub -, python3 +, jproperties +, luhn +, lxml +, pytest-mock +, pytestCheckHook +, python-Levenshtein +, pythonOlder +, pyyaml }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "whispers"; version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - sha256 = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o="; + hash = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ astroid beautifulsoup4 jproperties @@ -24,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 5b4f535563c22..563e792850d50 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,13 +8,20 @@ buildPythonPackage rec { pname = "widgetsnbextension"; version = "3.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; + hash = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; }; - propagatedBuildInputs = [ notebook ]; + # setup.py claims to require notebook, but the source doesn't have any imports + # in it. + postPatch = '' + substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" + ''; + + propagatedBuildInputs = [ ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 5e0733b6256e7..e0a9f4c5d73e8 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 2eb38dd0784ec..948ca6c6b8877 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.23"; + version = "1.1.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; + sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 7a7132a83266a..7457cc14f3119 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yte"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koesterlab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index a10e9ae65c791..da0ae7872dae7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -4,6 +4,7 @@ , asynctest , buildPythonPackage , crccheck +, cryptography , fetchFromGitHub , pycryptodome , pytest-aiohttp @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.44.2"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,13 +25,14 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I="; + sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE="; }; propagatedBuildInputs = [ aiohttp aiosqlite crccheck + cryptography pycryptodome voluptuous ]; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 028e30f4cb740..d0f938c6a8bf2 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.35.3"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8="; + sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix index d017c213415c6..5699bc7c61b8e 100644 --- a/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -1,10 +1,12 @@ -{ lib +{ stdenv +, lib , clang , cmake , fetchFromGitHub , llvmPackages , rustPlatform , testers +, Security }: let @@ -21,7 +23,8 @@ let }; nativeBuildInputs = [ clang cmake ]; - buildInputs = [ llvmPackages.libclang ]; + buildInputs = [ llvmPackages.libclang ] + ++ lib.optional stdenv.isDarwin Security; cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index efeaf9df50750..7d9dbe6f393db 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -76,8 +76,9 @@ let ''; homepage = "https://github.com/com-lihaoyi/Ammonite"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; + mainProgram = "amm"; + platforms = platforms.all; }; }; in { diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1245603c53a49..52899ac238e1c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1110"; + version = "2.0.1118"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI="; + hash = "sha256-8zhCyIHI3Pl5fTqQGSe8l6+7DZQsI6YgyTSCs1BNe94="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index b169877f5c1f7..d7b519b04c347 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,36 +3,35 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, libbsd -, python27 , gmpxx -, ncurses5 , gnustep -, libffi +, libbsd +, libffi_3_3 +, ncurses6 }: + stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.29"; - rev = "v${lib.versions.major version}"; + version = "5.5.3"; + rev = "v4"; src = fetchurl { - url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh"; + url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux-demo.pkg.tar.xz"; + hash = "sha256-xq9ZVg1leHm/tq6LYyQLa8p5dDwBd64Jt92uMoE0z58="; }; sourceRoot = "."; nativeBuildInputs = [ - wrapQtAppsHook autoPatchelfHook + wrapQtAppsHook ]; buildInputs = [ - libbsd - python27 - gmpxx - ncurses5 gnustep.libobjc + libbsd + libffi_3_3 + ncurses6 ]; installPhase = '' @@ -54,9 +53,6 @@ stdenv.mkDerivation rec { $sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \ $out/lib - # we already ship libffi.so.7 - ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6 - cp -r $sourceRoot/usr/share $out runHook postInstall diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 33e5de472c2d1..9ecc01c0a483f 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,21 +2,23 @@ buildGoModule rec { pname = "tflint"; - version = "0.35.0"; + version = "0.36.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLPKc9QeT9r0JUYcTMSHPa/4FxYiMLMdnv2iOMdBAy0="; + sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0="; }; - vendorSha256 = "sha256-J1PgrWFAu1LrAYdoJP3HUunz/MkJ4Co0+hc7e6nFTBo="; + vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU="; doCheck = false; subPackages = [ "." ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index a4fdf0085c30a..cedf2535df355 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xeAMwYpi9WvKALzOPLjVItHYzFJW+O++5jgqRSC7awk="; + sha256 = "sha256-ikMmd+avT8Fl+oZti2aegX4knYmPgEE/FOMAMZriV0g="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-xDK40Vc2tHZ7apfKznt7EEz1vR6UhqtXHgYXR2mISiI="; + vendorSha256 = "sha256-LRXnBSG+xpQ3QqF2SiC2s3luTaBxFHOF3XXxhFZV5D0="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 7d56e55ebdb38..21e9abd04f203 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -40,10 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "info" ]; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -54,8 +51,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 183548f5e31bd..7c4b0ad4650e8 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -37,10 +37,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { - homepage = "https://www.gnu.org/software/make/"; description = "A tool to control the generation of non-source files from sources"; - license = licenses.gpl3Plus; - longDescription = '' Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. @@ -51,8 +48,11 @@ stdenv.mkDerivation rec { should write a makefile for it, so that it is possible to use Make to build and install the program. ''; + homepage = "https://www.gnu.org/software/make/"; - platforms = platforms.all; + license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; + mainProgram = "make"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/jam/ftjam.nix b/pkgs/development/tools/build-managers/jam/ftjam.nix index 6007b67f148b9..1f106401c0d12 100644 --- a/pkgs/development/tools/build-managers/jam/ftjam.nix +++ b/pkgs/development/tools/build-managers/jam/ftjam.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://freetype.org/jam/"; description = "Freetype's enhanced, backwards-compatible Jam clone"; + homepage = "https://freetype.org/jam/"; license = licenses.free; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "jam"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index b13762d63b169..675160751d1e0 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/michaelforney/samurai"; description = "ninja-compatible build tool written in C"; longDescription = '' samurai is a ninja-compatible build tool with a focus on simplicity, @@ -50,8 +49,10 @@ stdenv.mkDerivation rec { .ninja_deps as the original ninja tool, currently version 5 and 4 respectively. ''; + homepage = "https://github.com/michaelforney/samurai"; license = with licenses; [ mit asl20 ]; # see LICENSE maintainers = with maintainers; [ dtzWill AndersonTorres ]; + mainProgram = "samu"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 2677027637229..fa59649dd2392 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = - "A more featureful runner for sbt, the simple/scala/standard build tool"; + description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = "https://github.com/paulp/sbt-extras"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nequissimus puffnfresh ]; + mainProgram = "sbt"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 9244a80672ed8..b8cef88f71a1b 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-qMSXz4ZJ0po+Qi/K3Q/51MgHBO4tOa+DHw6Ok0yYc+k="; + sha256 = "sha256-hZINmKzLB0nFVVP8eXK2ghe4Emmuq55w0vDwLw8XuJk="; }; vendorSha256 = null; @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam ]; + mainProgram = "buildctl"; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index aae87fb976d7b..abd77dd1f4ae8 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.290.1"; + version = "2.291.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-YUV66yiUdS2/ORZS7a7coqyzoXM/tnK0egEeXWLPNl0="; + hash = "sha256-0Eijq2vXY+Y2g3bhEhIGnFxTCLXpw7k3iXpgj3x8nL4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 1fbb42442503b..946d660610e83 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.10.0"; + version = "14.10.1"; in buildGoModule rec { inherit version; @@ -20,7 +20,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "033b68hwqk5hn2by4hk1z7v6p08d505grl9hrx72p4wpyk18c80l"; + sha256 = "1ph8byrh8kbg6s3gm5fakqk0ss6995pidgm664z3rwibr0h6m7sm"; }; patches = [ @@ -55,6 +55,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm globin ]; + maintainers = with maintainers; [ bachp zimbatm globin yayayayaka ]; }; } diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c95c99814df4..9fa52f4a65885 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.332.2"; + version = "2.332.3"; src = fetchurl { - url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0z0igaq29nsxbkdzqfgrh10206a7ndsvz79bj8078hq8hqvl3an7"; + url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; + sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; + mainProgram = "jenkins-cli"; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 96b86719e6c8c..d0d32de0ce137 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -28,9 +28,10 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://dapr.io"; description = "A CLI for managing Dapr, the distributed application runtime"; + homepage = "https://dapr.io"; license = licenses.mit; maintainers = with maintainers; [ lucperkins ]; + mainProgram = "dapr"; }; } diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 79c31c1937fe7..fbb435128ddd6 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UFvrtLVHGlWUlvA7KLDgaCydE/UoxtYV+8RqLblOdns="; + hash = "sha256-hFpz2p8lJ4HpuSMZ8IDtqp2PIJFqEcelbYVAQpldu4o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 06b17c1ff1fd5..5838f5e94b433 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Build automation for the container era"; homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; - license = licenses.bsl11; + license = licenses.mpl20; maintainers = with maintainers; [ zoedsoupe ]; }; } diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index 79470814ada03..c9ed951d5960f 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/pkgs/development/tools/ent/default.nix @@ -31,10 +31,11 @@ buildGoModule rec { meta = with lib; { description = "An entity framework for Go"; + homepage = "https://entgo.io/"; downloadPage = "https://github.com/ent/ent"; license = licenses.asl20; - homepage = "https://entgo.io/"; maintainers = with maintainers; [ superherointj ]; + mainProgram = "ent"; }; } diff --git a/pkgs/development/tools/flip-link/default.nix b/pkgs/development/tools/flip-link/default.nix index 6e752379a73a6..d42e282289afd 100644 --- a/pkgs/development/tools/flip-link/default.nix +++ b/pkgs/development/tools/flip-link/default.nix @@ -2,23 +2,31 @@ rustPlatform.buildRustPackage rec { pname = "flip-link"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LE0cWS6sOb9/VvGloezNnePHGldnpfNTdCFUv3F/nwE="; + sha256 = "sha256-Sf2HlAfPlg8Er2g17AnRmUkvRhTw5AVPuL2B92hFvpA="; }; - cargoSha256 = "sha256-8WBMF5stMB4JXvYwa5yHVFV+3utDuMFJNTZ4fZFDftw="; + cargoSha256 = "sha256-2VgsO2hUIvSPNQhR13+bGTxXa6xZXcK0amfiWv2EIxk="; buildInputs = lib.optional stdenv.isDarwin libiconv; + checkFlags = [ + # requires embedded toolchains + "--skip should_link_example_firmware::case_1_normal" + "--skip should_link_example_firmware::case_2_custom_linkerscript" + "--skip should_verify_memory_layout" + ]; + meta = with lib; { description = "Adds zero-cost stack overflow protection to your embedded programs"; homepage = "https://github.com/knurling-rs/flip-link"; - license = with licenses; [ asl20 mit ]; - maintainers = [ maintainers.FlorianFranzen ]; + changelog = "https://github.com/knurling-rs/flip-link/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ FlorianFranzen newam ]; }; } diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 708cdb511a84c..afc91cb603092 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation { dontFixup = true; meta = with lib; { - homepage = "https://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; + homepage = "https://www.gnu.org/software/gnulib/"; license = licenses.gpl3Plus; + mainProgram = "gnulib-tool"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 8c340b2ccf6c1..9f53c70201404 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/swaggo/swag"; license = licenses.mit; maintainers = with maintainers; [ stephenwithph ]; + mainProgram = "swag"; }; } diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 56b47bd8c6010..4290d1501ebf4 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -17,9 +17,10 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; + homepage = "https://goa.design"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; + mainProgram = "goagen"; }; } diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index fb6ce653cc4bc..802be18e566f7 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -1,25 +1,28 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "goconvey"; - version = "1.6.3"; + version = "1.7.2"; - goPackagePath = "github.com/smartystreets/goconvey"; excludedPackages = "web/server/watch/integration_testing"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "smartystreets"; repo = "goconvey"; - rev = version; - sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; + rev = "v${version}"; + sha256 = "sha256-YT9M9VaLIGUo6pdkaLWLtomcjrDqdnOqwl+C9UwDmT8="; }; + vendorSha256 = "sha256-sHyK/4YdNCLCDjxjMKygWAVRnHZ1peYjYRYyEcqoe+E="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; homepage = "https://github.com/smartystreets/goconvey"; - maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vdemeester ]; }; } diff --git a/pkgs/development/tools/goconvey/deps.nix b/pkgs/development/tools/goconvey/deps.nix deleted file mode 100644 index d329359da7099..0000000000000 --- a/pkgs/development/tools/goconvey/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "0b37b35ec7434b77e77a4bb29b79677cced992ea"; - sha256 = "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"; - }; - } -] diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index 96fd79d62fc60..26c9eeedacd7e 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/josephburnett/jd"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 blaggacao ]; + mainProgram = "jd"; }; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 5abbf71e7f412..c9510a35d10f8 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -16,7 +16,8 @@ buildGoPackage rec { meta = with lib; { description = "A JMESPath implementation in Go"; homepage = "https://github.com/jmespath/go-jmespath"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; + mainProgram = "jpgo"; }; } diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/development/tools/kustomize/3.nix index aa99256faa84f..d9eb6ce298ec4 100644 --- a/pkgs/development/tools/kustomize/3.nix +++ b/pkgs/development/tools/kustomize/3.nix @@ -36,5 +36,6 @@ buildGoModule rec { homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester zaninime Chili-Man saschagrunert ]; + mainProgram = "kustomize"; }; } diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 1582ca8740265..1a71b9bc857ff 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation { meta = with lib; { description = "A literate programming tool for any language"; - homepage = "http://literate.zbyedidia.webfactional.com/"; + homepage = "https://zyedidia.github.io/literate/"; license = licenses.mit; + mainProgram = "lit"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 0fa34c7eefe81..16c056bc3ff09 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -25,13 +25,13 @@ let makeArcWrapper = toolset: '' in stdenv.mkDerivation { pname = "arcanist"; - version = "20200711"; + version = "20220425"; src = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; - sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; + rev = "da206314cf59f71334b187283e18823bddc16ddd"; + sha256 = "sha256-6VVUjFMwPQvk22Ni1YUSgks4ZM0j1JP+71VnYKD8onM="; }; patches = [ ./dont-require-python3-in-path.patch ]; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 1aef6d52075fe..cbe223513272e 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,8 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; + mainProgram = "chruby-exec"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 806625934d95b..e0f71b2b3c318 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; meta = { - homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; - longDescription = '' GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible although it has some @@ -38,8 +36,10 @@ stdenv.mkDerivation rec { recursion etc... m4 can be used either as a front-end to a compiler or as a macro processor in its own right. ''; + homepage = "https://www.gnu.org/software/m4/"; license = lib.licenses.gpl3Plus; + mainProgram = "m4"; platforms = lib.platforms.unix ++ lib.platforms.windows; }; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 35c651f4a18c1..e3c4aef87bd30 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "https://premake.github.io/"; description = "A simple build configuration and project generation tool using lua"; + homepage = "https://premake.github.io/"; license = lib.licenses.bsd3; - platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; + mainProgram = "premake4"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index c3349661c559d..7478c27ce9f5a 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.51"; + version = "2.3.52"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-Z5GPA1cJbQJOjntWXe1uF26e7nJ99+ANoCP57Y/OO5A="; + sha256 = "sha256-Z1xDVb1qFPtTi40dZ1CBw6ZqtQbYjuUjeUinBV+wdw8="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 3c191d7c6a91b..e8020787130ae 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; + sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 4d17680471d27..eb6c8bd761999 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://goosecode.com/watson/"; license = with licenses; mit; maintainers = with maintainers; [ robertodr nicknovitski ]; + mainProgram = "watson"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 82d84c819dd2c..7805ca264035f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.11.0"; + version = "4.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "sha256:0flws9mw0yjfw4d8d3y3k408mivy2xgky70xk1br3iqs4zksz38m"; + sha256 = "sha256:0pj9jjrmi0xxrzmygv4b5whsibw1jxy3wgibmws85x5jwlczh0nz"; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index c67d05c15038f..fa9ff95b0fd2d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,13 +1,26 @@ -{ buildDunePackage, js_of_ocaml-compiler +{ lib, buildDunePackage, fetchFromGitHub , ocamlbuild }: -buildDunePackage { +buildDunePackage rec { pname = "js_of_ocaml-ocamlbuild"; - - inherit (js_of_ocaml-compiler) version src meta useDune2; + version = "4.0.0"; minimalOCamlVersion = "4.02"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = pname; + rev = "852302c8f35b946e2ec275c529a79e46d8749be6"; + sha256 = "sha256:03ayvakvbh4wi4dwcgd7r9y8ka8cv3d59hb81yk2dxyd94bln145"; + }; + propagatedBuildInputs = [ ocamlbuild ]; + + meta = { + description = "An ocamlbuild plugin to compile to JavaScript"; + license = lib.licenses.lgpl2Only; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index 9ec8aa21e2d31..4b39fccdd3669 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -1,17 +1,25 @@ -{ lib, rustPlatform, fetchCrate, makeWrapper, wasm-pack }: +{ lib +, stdenv +, rustPlatform +, fetchCrate +, makeWrapper +, wasm-pack +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "perseus-cli"; - version = "0.3.0"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YyQQjuxNUxuo2PFluGyT/CpG22tgjRCfmFKA5MFRgHo="; + sha256 = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; - cargoSha256 = "sha256-SKxPsltXFH+ENexn/KDD43hGLSTgvtU9hv9Vdi2oeFA="; + cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; postInstall = '' wrapProgram $out/bin/perseus \ diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 2f58737637f66..0d6e5de4cfe5b 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -11,20 +11,22 @@ with python3.pkgs; buildPythonApplication rec { pname = "prospector"; - version = "1.5.1"; + version = "1.7.7"; format = "pyproject"; + disabled = pythonOlder "3.6.1"; src = pkgs.fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "17f822cxrvcvnrzdx1a9fyi9afljq80b6g6z1k2bqa1vs21gwv7l"; + hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' + --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \ + --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' ''; nativeBuildInputs = [ @@ -61,9 +63,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity"; homepage = "https://github.com/PyCQA/prospector"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index df5afac2dbb21..a54c860f29572 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,19 +2,23 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.8.0"; + version = "0.8.1"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-TaHfyYoWsA/g5xZFxIMNwE1w6Dd9Cq5bp1gpQudYLs0="; + sha256 = "sha256-5PACgKqc8rWqaA6Syj5NyxHm3827yd67tm0mwVSMnWQ="; }; vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; subPackages = [ "protoc-gen-twirp_php" ]; + ldflags = [ + "-X main.version=${version}" + ]; + meta = with lib; { description = "PHP port of Twitch's Twirp RPC framework"; homepage = "https://github.com/twirphp/twirp"; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index b5cc43a672470..e3636e16f58cf 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.8"; + version = "0.20.9"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0lakss2pg5kwbxqsmvzgkcc70l6j40cj9rarhkpcf0kxw98bb5x0"; - rev = "744bdbbefc538750d4c36888ee53dc5d336314c4"; + sha256 = "00vdqg7vaw3d9zwh47886lw9fhhlwjagzhaj3aqz4xm92pjavhih"; + rev = "d16d4914200783fbd820ba89dbdf67270454faf5"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 12595885df3c9..b97b0fe94a9cc 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -33,4 +33,7 @@ cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. -echo "Finished." +echo +echo "Finished. Make sure you run the following commands to confirm Spago builds correctly:" +echo ' - `nix build -L -f ./. spago`' +echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index f77e2feb4ff37..458b4a10c8d08 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -46,7 +46,8 @@ in rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; - platforms = platforms.unix; maintainers = with maintainers; [ johntitor ralith ]; + mainProgram = "bindgen"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 860d537170982..de75edf5e7305 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.16"; + version = "1.0.19"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; + sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw="; }; - cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; + cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 46738f7cf45ea..92439d2a572b9 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.11"; + version = "0.35.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NzhEXt0z+0/6F3pgGmQwjnexBA2icWV3dCifZ8BxnOQ="; + sha256 = "sha256-BBSZTbzT+8obY677Yfmf1VTwg0GtvMNY/FTlS6isJTE="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-+FGl0JhaRu+KLQJGAcMXv9vP6pmRzdTDtNA3h6A1jcY="; + cargoSha256 = "sha256-Nsm6KnL72HjqGevXwg2qYagzMG5nEFuH9DblbcUv6Qg="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 3e471a3ac5512..acacdcefb4150 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ="; src = fetchFromGitHub { - owner = "rust-analyzer"; + owner = "rust-lang"; repo = "rust-analyzer"; rev = version; sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA="; @@ -61,5 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://rust-analyzer.github.io"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ oxalica ]; + mainProgram = "rust-analyzer"; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 000a728a2b25c..36c3fd3941b95 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -3,7 +3,7 @@ # shellcheck shell=bash set -euo pipefail cd "$(dirname "$0")" -owner=rust-analyzer +owner=rust-lang repo=rust-analyzer nixpkgs=../../../../.. diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 61959b98b4cc8..943d6b60b60d8 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; + license = licenses.asl20; maintainers = with maintainers; [ coconnor offline ]; + mainProgram = "selenium-server"; platforms = platforms.all; - license = licenses.asl20; }; } diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo-cli/default.nix index e19de1c3cdf1f..0c584a36a526c 100644 --- a/pkgs/development/tools/taplo-cli/default.nix +++ b/pkgs/development/tools/taplo-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "taplo-cli"; - version = "0.5.0"; + version = "0.6.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+0smR1FDeJMSa/LaRM2M53updt5p8717DEaFItNXCdM="; + sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY="; }; - cargoSha256 = "sha256-d7mysGYR72shXwvmDXr0oftSa+RtRoSbP++HBR40Mus="; + cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; - buildInputs = lib.optional stdenv.isLinux openssl - ++ lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A TOML toolkit written in Rust"; diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index bd297154cc36c..f9cef54564f8c 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec { description = "one CLI to format the code tree"; homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ zimbatm ]; + maintainers = lib.teams.numtide.members; }; } diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 00cdae21e1ff2..3c40a0c0ce8e8 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-69MQDIF79pSuaOgZEIqb/ESPQzL7MUiQaJaxPccGxo8="; + sha256 = "sha256-VHUs/trR1M5WacEA0gwKLkGtsws9GFmn1vK0kRxpNII="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoSha256 = "sha256-3WTxCMNpBmiNbZMHp5BrqTXa1vmE/ZZ/8XbdcfxBfYg="; + cargoSha256 = "sha256-czXe9W+oR1UV7zGZiiHcbydzH6sowa/8upm+5lkPG1U="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4a2fc5aafc5bc..455b215bb5142 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4="; + sha256 = "sha256-oRlrommD84x4M+Z/F70TjFwWSlvTb26v36zxgaMBifw="; }; - cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE="; + cargoSha256 = "sha256-kVNT9B9B3Li9B8aRFkUx5WkGZH7eqSMQO0GRPTC5tgU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 87b6ddfa923eb..8850f495027c1 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -17,10 +17,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" - "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" - "-X github.com/superfly/flyctl/flyctl.Environment=production" - "-X github.com/superfly/flyctl/flyctl.Version=${version}" + "-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}" + "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00+0000" + "-X github.com/superfly/flyctl/internal/buildinfo.environment=production" + "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}" ]; preBuild = '' diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index a87892c5f1471..3d2901bc9acee 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -33,11 +33,11 @@ crystal.buildCrystalPackage rec { ''; meta = with lib; { - description = - "A Crystal library for creating and running tasks. Also generates Lucky projects"; + description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "lucky"; platforms = platforms.unix; broken = lib.versionOlder crystal.version "0.35.1"; }; diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix index a3ec7ff3f3189..e6f164f2bca2d 100644 --- a/pkgs/development/web/shopify-cli/default.nix +++ b/pkgs/development/web/shopify-cli/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { description = "CLI which helps you build against the Shopify platform faster"; homepage = "https://github.com/Shopify/shopify-cli"; license = licenses.mit; - platforms = ruby.meta.platforms; maintainers = with maintainers; [ onny ]; + mainProgram = "shopify"; + platforms = ruby.meta.platforms; }; } diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index c5170c9845cca..fd8935594696f 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -57,10 +57,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with licenses; [ - cc-by-sa-40 - ]; + license = with licenses; [ cc-by-sa-40 ]; maintainers = with maintainers; [ lux ]; + mainProgram = "Bugdom"; platforms = platforms.unix; }; } diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix index ff9e0f9dea6d1..c09f474e70c79 100644 --- a/pkgs/games/crossfire/crossfire-arch.nix +++ b/pkgs/games/crossfire/crossfire-arch.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "crossfire-arch"; - version = "r${toString rev}"; + version = rev; src = fetchsvn { url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/"; - sha256 = sha256; - rev = rev; + inherit sha256; + rev = "r${rev}"; }; installPhase = '' diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix index 799ae4ab6ee76..0d335b4f529a6 100644 --- a/pkgs/games/crossfire/crossfire-client.nix +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "crossfire-client"; - version = "r${toString rev}"; + version = rev; src = fetchsvn { url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/"; - sha256 = sha256; - rev = rev; + inherit sha256; + rev = "r${rev}"; }; nativeBuildInputs = [ cmake pkg-config perl vala ]; diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix index 0521b038d361d..cb514a90d1699 100644 --- a/pkgs/games/crossfire/crossfire-maps.nix +++ b/pkgs/games/crossfire/crossfire-maps.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "crossfire-maps"; - version = "r${toString rev}"; + version = rev; src = fetchsvn { url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/"; - sha256 = sha256; - rev = rev; + inherit sha256; + rev = "r${rev}"; }; installPhase = '' diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index 9259e8e52faa0..f99e08a5a46fa 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "crossfire-server"; - version = "r${toString rev}"; + version = rev; src = fetchsvn { url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/"; - sha256 = sha256; - rev = rev; + inherit sha256; + rev = "r${rev}"; }; nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python3 ]; diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix index bc74c00bcce4d..7d0716df3d9b9 100644 --- a/pkgs/games/crossfire/default.nix +++ b/pkgs/games/crossfire/default.nix @@ -3,26 +3,26 @@ rec { crossfire-client = callPackage ./crossfire-client.nix { version = "1.75.0"; - rev = 21760; + rev = "21760"; sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d"; }; crossfire-server = callPackage ./crossfire-server.nix { version = "latest"; - rev = 22111; + rev = "22111"; sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7"; maps = crossfire-maps; arch = crossfire-arch; }; crossfire-arch = callPackage ./crossfire-arch.nix { version = "latest"; - rev = 22111; + rev = "22111"; sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms"; }; crossfire-maps = callPackage ./crossfire-maps.nix { version = "latest"; - rev = 22111; + rev = "22111"; sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap"; }; } diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 43c8e08c79f55..5d386bce6db9c 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,35 +1,43 @@ -{ lib, stdenv, fetchurl, fetchzip, SDL, SDL_net }: +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, SDL2 +, SDL2_net +, pkg-config +}: stdenv.mkDerivation rec { pname = "opentyrian"; - version = "2.1.20130907"; + version = "2.1.20220318"; - src = fetchurl { - url = "https://bitbucket.org/opentyrian/opentyrian/get/${version}.tar.gz"; - sha256 = "1jnrkq616pc4dhlbd4n30d65vmn25q84w6jfv9383l9q20cqf2ph"; + src = fetchFromGitHub { + owner = "opentyrian"; + repo = "opentyrian"; + rev = "v${version}"; + sha256 = "01z1zxpps4ils0bnwazl9lmqdbfhfd8fkacahnh6kqyczavg40xg"; }; data = fetchzip { - url = "http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip"; + url = "https://camanis.net/tyrian/tyrian21.zip"; sha256 = "1biz6hf6s7qrwn8ky0g6p8w7yg715w7yklpn6258bkks1s15hpdb"; }; - buildInputs = [SDL SDL_net]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL2 SDL2_net ]; - patchPhase = " - substituteInPlace src/file.c --replace /usr/share $out/share - "; - buildPhase = "make release"; - installPhase = " - mkdir -p $out/bin - cp ./opentyrian $out/bin - mkdir -p $out/share/opentyrian/data - cp -r $data/* $out/share/opentyrian/data - "; + enableParallelBuilding = true; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + postInstall = '' + mkdir -p $out/share/games/tyrian + cp -r $data/* $out/share/games/tyrian/ + ''; meta = { description = ''Open source port of the game "Tyrian"''; - homepage = "https://bitbucket.org/opentyrian/opentyrian"; + homepage = "https://github.com/opentyrian/opentyrian"; # This does not account of Tyrian data. # license = lib.licenses.gpl2; }; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 52bd5c00d4392..7b7d66f6188c1 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.18.1"; - buildNum = "132"; + mcVersion = "1.18.2"; + buildNum = "313"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "af26babef1e9134804bdf61e14eed7677d603516638f5a2ffe97e176ebd9839b"; + sha256 = "sha256-wotk0Pu1wKomj83nMCyzzPZ+Y9RkQUbfeWjRGaSt7lE="; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index 607a53579c7eb..eb1dd25811aaf 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/foldex/r2mod_cli"; license = licenses.gpl3Only; maintainers = [ maintainers.reedrw ]; + mainProgram = "r2mod"; platforms = platforms.unix; }; } diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index b2796225a6c78..b74d3630e0e69 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -21,7 +21,8 @@ tcl.mkTclDerivation rec { homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; license = lib.licenses.mit; - platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dbohdan ]; + mainProgram = "2048"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index e7b3d1c496d4c..e6e089e886129 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/rhaberkorn/openrussian-cli"; description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; platforms = platforms.unix; }; } diff --git a/pkgs/misc/platformsh/default.nix b/pkgs/misc/platformsh/default.nix index 9c0410b473801..64b9168fee481 100644 --- a/pkgs/misc/platformsh/default.nix +++ b/pkgs/misc/platformsh/default.nix @@ -42,9 +42,10 @@ stdenv.mkDerivation { meta = with lib; { description = "The unified tool for managing your Platform.sh services from the command line."; - license = licenses.mit; homepage = "https://github.com/platformsh/platformsh-cli"; + license = licenses.mit; maintainers = with maintainers; [ shyim ]; + mainProgram = "platform"; platforms = platforms.all; }; } diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index e2970bd30bae4..17ea9ffee6e53 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -1,17 +1,20 @@ -{ lib, python3 }: +{ lib +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "rich-cli"; - version = "1.5.1"; + version = "1.7.0"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k"; + sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk="; }; - format = "pyproject"; - - nativeBuildInputs = [ python3.pkgs.poetry-core ]; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; propagatedBuildInputs = with python3.pkgs; [ rich @@ -21,11 +24,18 @@ python3.pkgs.buildPythonApplication rec { rich-rst ]; - buildInputs = [ python3 ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'rich = "^12.3.0"' 'rich = "*"' + ''; + + pythonImportsCheck = [ + "rich_cli" + ]; meta = with lib; { - homepage = "https://github.com/Textualize/rich-cli"; description = "Command Line Interface to Rich"; + homepage = "https://github.com/Textualize/rich-cli"; license = licenses.mit; maintainers = with maintainers; [ jyooru ]; }; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 9962601875067..bbabd02f4751d 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -22,10 +22,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; + homepage = "https://github.com/pipeseroni/pipes.sh"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; + mainProgram = "pipes.sh"; platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index dd9436d9b0ea5..d424f89fdfb39 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -13,7 +13,7 @@ , libxml2 , libxslt , docbook_xml_dtd_45 -, docbook_xsl +, docbook-xsl-nons , glib , systemd , polkit @@ -21,39 +21,33 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm"; + sha256 = "eXjj7oD5HOW/AG2uxDa0tSleKmbouFd2fwlL2HHFiMA="; }; patches = [ # meson install tries to create /var/lib/boltd ./0001-skip-mkdir.patch - # https://github.com/NixOS/nixpkgs/issues/104429 + # Test does not work on ZFS with atime disabled. # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 (fetchpatch { - name = "disable-atime-tests.diff"; - url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; - sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; - }) - - # Fix tests with newer umockdev - (fetchpatch { - url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch"; - sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk="; + url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/c2f1d5c40ad71b20507e02faa11037b395fac2f8.diff"; + revert = true; + sha256 = "6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I="; }) ]; nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 - docbook_xsl + docbook-xsl-nons libxml2 libxslt meson diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index c2701c057193e..470b590187044 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dropwatch"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - sha256 = "0axx0zzrs7apqnl0r70jyvmgk7cs5wk185id479mapgngibwkyxy"; + sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c3dc819b5bcff..3caf41cfca562 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -37,9 +37,16 @@ stdenv.mkDerivation rec { # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch + + # NixOS specific whitelist to resolve binary paths in user environment + # Fixes https://github.com/NixOS/nixpkgs/issues/170784 + # Upstream fix https://github.com/netblue30/firejail/pull/5131 + # Upstream hopefully fixed in later versions > 0.9.68 + ./whitelist-nix-profile.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch new file mode 100644 index 0000000000000..227d28846ea5f --- /dev/null +++ b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch @@ -0,0 +1,9 @@ +--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200 ++++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200 +@@ -83,3 +83,6 @@ + whitelist ${HOME}/.kde4/share/config/oxygenrc + whitelist ${HOME}/.kde4/share/icons + whitelist ${HOME}/.local/share/qt5ct ++ ++# NixOS specific to resolve binary paths ++whitelist ${HOME}/.nix-profile diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 5152b3dfe714d..86a3924c0e28b 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { description = "facetimehd calibration"; homepage = "https://support.apple.com/kb/DL1837"; license = licenses.unfree; - maintainers = with maintainers; [ womfoo grahamc ]; + maintainers = with maintainers; [ alexshpilkin womfoo grahamc ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 1d1d5667fe989..5c3154bf39df3 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "21.42.21270"; + version = "22.17.23034"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "N9MsDcsL8kBWxfZjhukcxZiSJnXxqMgWF0etOhf2/AE="; + sha256 = "sha256-ae6kPiVQe3+hcqXVu2ncCaVQAoMKoDHifrkKpt6uWX8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index bc5811942a591..424a1d1a50e5b 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.26"; + version = "1.27"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-+BciYfb9++u9Ux4AdvPFFIFVq8j+TVoTLKqxzmn5p3o="; + sha256 = "sha256-gN9+9Cc6zjZBXDhcHBH5wyucO5/vL7bKSLWM5laFqaA="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cb73bbed5575e..16b0ac27fc6b0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.276-hardened1.patch", - "sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch" + "name": "linux-hardened-4.14.277-hardened1.patch", + "sha256": "1jjbywmwglnsj80dbic14bip6wfllsgqgw7lcn9s8n12mdr42ps2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.277-hardened1/linux-hardened-4.14.277-hardened1.patch" }, - "sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf", - "version": "4.14.276" + "sha256": "058vzn1gcsc194hgwrj78afawz2anm7ga8a1x5m5i4cw8p1arp73", + "version": "4.14.277" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.239-hardened1.patch", - "sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch" + "name": "linux-hardened-4.19.240-hardened1.patch", + "sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch" }, - "sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z", - "version": "4.19.239" + "sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j", + "version": "4.19.240" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.112-hardened1.patch", - "sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch" + "name": "linux-hardened-5.10.113-hardened1.patch", + "sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch" }, - "sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c", - "version": "5.10.112" + "sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2", + "version": "5.10.113" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.35-hardened1.patch", - "sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch" + "name": "linux-hardened-5.15.36-hardened1.patch", + "sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch" }, - "sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha", - "version": "5.15.35" + "sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n", + "version": "5.15.36" + }, + "5.17": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-5.17.5-hardened1.patch", + "sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch" + }, + "sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v", + "version": "5.17.5" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.190-hardened1.patch", - "sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch" + "name": "linux-hardened-5.4.191-hardened1.patch", + "sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch" }, - "sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41", - "version": "5.4.190" + "sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318", + "version": "5.4.191" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c03c5d5afd210..2e1f98af3e204 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.240"; + version = "4.19.241"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j"; + sha256 = "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 44438676ae3d4..007258e73360f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.36"; + version = "5.15.37"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n"; + sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index b22af8d708388..7172aca65f693 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, bash }: +{ stdenv, lib, fetchurl, bash, gitUpdater }: stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ="; + sha256 = "sha256-i67S+cWujgzaG5x1mQhkEBr8ZPrQpGFuEPP/jviRBAs="; }; strictDeps = true; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "ELF utils that can check files for security relevant properties"; longDescription = '' diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 9f96eb2576dc2..253c3caf6aad1 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -8,6 +8,7 @@ , libgudev , glib , polkit +, dbus , gobject-introspection , gettext , gtk-doc @@ -29,34 +30,21 @@ let dbus-python python-dbusmock ]; - testTypelibPath = lib.makeSearchPathOutput "lib" "lib/girepository-1.0" [ umockdev ]; in stdenv.mkDerivation rec { pname = "power-profiles-daemon"; - version = "0.10.1"; + version = "0.11.1"; - outputs = [ "out" "devdoc" "installedTests" ]; + outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = "power-profiles-daemon"; rev = version; - sha256 = "sha256-sQWiCHc0kEELdmPq9Qdk7OKDUgbM5R44639feC7gjJc="; + sha256 = "sha256-qU9A9U2R3UioC7bo8Pc0IIsHIjghb6gsG4pTAg6tp9E="; }; - patches = [ - # Enable installed tests. - # https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/merge_requests/92 - (fetchpatch { - url = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/commit/3c64d9e1732eb6425e33013c452f1c4aa7a26f7e.patch"; - sha256 = "din5VuZZwARNDInHtl44yJK8pLmlxr5eoD4iMT4a8HA="; - }) - - # Install installed tests to separate output. - ./installed-tests-path.patch - ]; - nativeBuildInputs = [ pkg-config meson @@ -70,9 +58,6 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsNoGuiHook python3.pkgs.wrapPython - - # For finding tests. - (python3.withPackages testPythonPkgs) ]; buildInputs = [ @@ -91,31 +76,28 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; + checkInputs = [ + umockdev + dbus + (python3.withPackages testPythonPkgs) + ]; + mesonFlags = [ - "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dgtk_doc=true" ]; + doCheck = true; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; # Avoid double wrapping dontWrapGApps = true; postPatch = '' - patchShebangs tests/unittest_inspector.py - ''; - - preConfigure = '' - # For finding tests. - GI_TYPELIB_PATH_original=$GI_TYPELIB_PATH - addToSearchPath GI_TYPELIB_PATH "${testTypelibPath}" - ''; - - postConfigure = '' - # Restore the original value to prevent the program from depending on umockdev. - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH_original - unset GI_TYPELIB_PATH_original + patchShebangs --build \ + tests/integration-test.py \ + tests/unittest_inspector.py ''; preInstall = '' @@ -128,33 +110,22 @@ stdenv.mkDerivation rec { export PKEXEC_UID=-1 ''; + postCheck = '' + # Do not contaminate the wrapper with test dependencies. + unset GI_TYPELIB_PATH + unset XDG_DATA_DIRS + ''; + postFixup = '' # Avoid double wrapping makeWrapperArgs+=("''${gappsWrapperArgs[@]}") # Make Python libraries available wrapPythonProgramsIn "$out/bin" "$pythonPath" - - # Make Python libraries available for installed tests - makeWrapperArgs+=( - --prefix GI_TYPELIB_PATH : "${testTypelibPath}" - --prefix PATH : "${lib.makeBinPath [ umockdev ]}" - # Vala does not use absolute paths in typelibs - # https://github.com/NixOS/nixpkgs/issues/47226 - # Also umockdev binaries use relative paths for LD_PRELOAD. - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ umockdev ]}" - # dbusmock calls its templates using exec so our regular patching of Python scripts - # to add package directories to site will not carry over. - # https://github.com/martinpitt/python-dbusmock/blob/2254e69279a02fb3027b500ed7288b77c7a80f2a/dbusmock/mockobject.py#L51 - # https://github.com/martinpitt/python-dbusmock/blob/2254e69279a02fb3027b500ed7288b77c7a80f2a/dbusmock/__main__.py#L60-L62 - --prefix PYTHONPATH : "${lib.makeSearchPath python3.sitePackages (testPythonPkgs python3.pkgs)}" - ) - wrapPythonProgramsIn "$installedTests/libexec/installed-tests" "$pythonPath ${lib.concatStringsSep " " (testPythonPkgs python3.pkgs)}" ''; passthru = { tests = { nixos = nixosTests.power-profiles-daemon; - installed-tests = nixosTests.installed-tests.power-profiles-daemon; }; }; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/installed-tests-path.patch b/pkgs/os-specific/linux/power-profiles-daemon/installed-tests-path.patch deleted file mode 100644 index 63059f3ac73c0..0000000000000 --- a/pkgs/os-specific/linux/power-profiles-daemon/installed-tests-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 7e89619..76497db 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ -+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests') - option('systemdsystemunitdir', - description: 'systemd unit directory', - type: 'string', -diff --git a/tests/meson.build b/tests/meson.build -index b306a7f..7670e1b 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -2,8 +2,8 @@ envs = environment() - envs.set ('top_builddir', meson.build_root()) - envs.set ('top_srcdir', meson.source_root()) - --installed_test_bindir = libexecdir / 'installed-tests' / meson.project_name() --installed_test_datadir = datadir / 'installed-tests' / meson.project_name() -+installed_test_bindir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() -+installed_test_datadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() - - python3 = find_program('python3') - unittest_inspector = find_program('unittest_inspector.py') -diff --git a/tests/integration-test.py b/tests/integration-test.py -index 22dc42c..0f92b76 100755 ---- a/tests/integration-test.py -+++ b/tests/integration-test.py -@@ -67,7 +67,7 @@ class Tests(dbusmock.DBusTestCase): - print('Testing binaries from JHBuild (%s)' % cls.daemon_path) - else: - cls.daemon_path = None -- with open('/usr/lib/systemd/system/power-profiles-daemon.service') as f: -+ with open('/run/current-system/sw/lib/systemd/system/power-profiles-daemon.service') as f: - for line in f: - if line.startswith('ExecStart='): - cls.daemon_path = line.split('=', 1)[1].strip() diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 7f6d224ff4d5b..6e040d3cbffb8 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -9,14 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; + patches = [ ./fno-common.patch ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.hostPlatform.isx86 libx86; cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.hostPlatform.isx86 then "ON" else "OFF"}" ]; - patchPhase = '' - substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' - ''; meta = with lib; { description = "Tool for reading and parsing EDID data from monitors"; diff --git a/pkgs/os-specific/linux/read-edid/fno-common.patch b/pkgs/os-specific/linux/read-edid/fno-common.patch new file mode 100644 index 0000000000000..336b48b66ad81 --- /dev/null +++ b/pkgs/os-specific/linux/read-edid/fno-common.patch @@ -0,0 +1,22 @@ +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index f6564f1560c1e..2077d23bc9d75 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { hash = "sha256-JriA9UGYFkAPuCtRizk8RMM1YOYGR/eO9ILnx47A40s="; }; dcap = rec { - version = "1.12.1"; + version = "1.13"; filename = "prebuilt_dcap_${version}.tar.gz"; prebuilt = fetchurl { url = "https://download.01.org/intel-sgx/sgx-dcap/${version}/linux/${filename}"; - hash = "sha256-V/XHva9Sq3P36xSW+Sd0G6Dnk4H0ANO1Ns/u+FI1eGI="; + hash = "sha256-0kD6hxN8qZ/7/H99aboQx7Qg7ewmYPEexoU6nqczAik="; }; }; in @@ -64,19 +64,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # https://github.com/intel/linux-sgx/pull/730 - substituteInPlace buildenv.mk --replace '/bin/cp' 'cp' - substituteInPlace psw/ae/aesm_service/source/CMakeLists.txt \ - --replace '/usr/bin/getconf' 'getconf' - - # https://github.com/intel/SGXDataCenterAttestationPrimitives/pull/205 - substituteInPlace ./external/dcap_source/QuoteGeneration/buildenv.mk \ - --replace '/bin/cp' 'cp' - substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/Makefile \ - --replace '/bin/cp' 'cp' - substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/buildenv.mk \ - --replace '/bin/cp' 'cp' - patchShebangs \ linux/installer/bin/build-installpkg.sh \ linux/installer/common/psw/createTarball.sh \ @@ -166,14 +153,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" - - header "Fixing linksgx.sh" - # https://github.com/intel/linux-sgx/pull/736 - substituteInPlace $out/aesm/linksgx.sh \ - --replace '/usr/bin/getent' \ - '${glibc.bin}/bin/getent' \ - --replace '/usr/sbin/usermod' \ - '${shadow}/bin/usermod' ''; passthru.tests = { diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index baa4ad2a3375c..977139406fe95 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { pname = "sgx-sdk"; # Version as given in se_version.h - version = "2.15.101.1"; + version = "2.16.100.4"; # Version as used in the Git tag - versionTag = "2.15.1"; + versionTag = "2.16"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx"; rev = "sgx_${versionTag}"; - hash = "sha256-e11COTR5eDPMB81aPRKatvIkAOeX+OZgnvn2utiv78M="; + hash = "sha256-qgXuJJWiqmcU11umCsE3DnlK4VryuTDAsNf53YPw6UY="; fetchSubmodules = true; }; @@ -53,18 +53,9 @@ stdenv.mkDerivation rec { url = "https://github.com/intel/linux-sgx/commit/254b58f922a6bd49c308a4f47f05f525305bd760.patch"; sha256 = "sha256-sHU++K7NJ+PdITx3y0PwstA9MVh10rj2vrLn01N9F4w="; }) - # Commit to add missing sgx_ippcp.h not yet part of this release - (fetchpatch { - name = "add-missing-sgx_ippcp-header.patch"; - url = "https://github.com/intel/linux-sgx/commit/51d1087b707a47e18588da7bae23e5f686d44be6.patch"; - sha256 = "sha256-RZC14H1oEuGp0zn8CySDPy1KNqP/POqb+KMYoQt2A7M="; - }) ]; postPatch = '' - # https://github.com/intel/linux-sgx/pull/730 - substituteInPlace buildenv.mk --replace '/bin/cp' 'cp' - patchShebangs linux/installer/bin/build-installpkg.sh \ linux/installer/common/sdk/createTarball.sh \ linux/installer/common/sdk/install.sh diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index fb10a5369f1d3..8b2a605261b40 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alps"; - version = "2021-09-29"; + version = "2022-03-01"; src = fetchFromSourcehut { owner = "~migadu"; repo = "alps"; - rev = "d4c35f3c3157bece8e50fd95f2ee1081be30d7ae"; - sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; + rev = "f4523b51af0787795973b403b978ff74737a47ef"; + hash = "sha256-un1RGIABFhHKeXPXtLnGayyoGzfo5PZc8VBSHA0PAaw="; }; vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo="; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 711c65f66176c..0ba836eeb6bc8 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - version = "2.5.0"; + version = "2.5.1"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -18,7 +18,7 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w="; + sha256 = "sha256-Y4GAx/8XcW7+6eXCQ6k4e/3WZ/6MkTr5za1AXp6El9o="; }; vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo="; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d47b5a3e6a3cb..1ec5a78ea1a2b 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] - ++ optionals stdenv.isLinux [ systemd libcap_ng ] + ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] ++ [ nghttp2 ] ## optional dependencies; TODO: dnstap ; @@ -79,8 +79,7 @@ unwrapped = stdenv.mkDerivation rec { rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; - doInstallCheck = with stdenv; hostPlatform == buildPlatform - && !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform + doInstallCheck = with stdenv; hostPlatform == buildPlatform; installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 5636f51a16998..875a2fa2c1fde 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -37,9 +37,10 @@ stdenv.mkDerivation rec { mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; meta = with lib; { - homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; + homepage = "https://github.com/soabase/exhibitor"; license = licenses.asl20; + mainProgram = "startExhibitor.sh"; platforms = platforms.unix; }; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 8f3739b4ebfb8..3df2d833e0baa 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -54,6 +54,7 @@ buildGoModule rec { homepage = "https://gotify.net"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "server"; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 963f81c1daf7f..afed37e315dc9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.4.7"; + version = "2022.5.2"; components = { "abode" = ps: with ps; [ abodepy @@ -157,10 +157,6 @@ ]; "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ - ha-ffmpeg - pyarlo - ]; "arris_tg2492lg" = ps: with ps; [ arris-tg2492lg ]; @@ -315,7 +311,8 @@ "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ - ]; # missing inputs: brunt + brunt + ]; "bsblan" = ps: with ps; [ bsblan ]; @@ -554,8 +551,6 @@ "digital_ocean" = ps: with ps; [ digital-ocean ]; - "digitalloggers" = ps: with ps; [ - ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; @@ -993,8 +988,7 @@ ]; "google" = ps: with ps; [ aiohttp-cors - google-api-python-client - httplib2 + gcal-sync oauth2client ]; "google_assistant" = ps: with ps; [ @@ -1248,9 +1242,15 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors + fnvhash + home-assistant-frontend + insteon-frontend-home-assistant + lru-dict + pillow pyinsteon pyserial pyudev + sqlalchemy ]; "integration" = ps: with ps; [ ]; @@ -1391,8 +1391,10 @@ life360 ]; "lifx" = ps: with ps; [ + aiohttp-cors aiolifx aiolifx-effects + ifaddr ]; "lifx_cloud" = ps: with ps; [ ]; @@ -1514,6 +1516,9 @@ "mazda" = ps: with ps; [ pymazda ]; + "meater" = ps: with ps; [ + meater-python + ]; "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light @@ -1748,7 +1753,8 @@ nexia ]; "nextbus" = ps: with ps; [ - ]; # missing inputs: py_nextbusnext + py-nextbusnext + ]; "nextcloud" = ps: with ps; [ nextcloudmonitor ]; @@ -1787,7 +1793,8 @@ "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ - ]; # missing inputs: notify-events + notify-events + ]; "notion" = ps: with ps; [ aionotion ]; @@ -2087,7 +2094,11 @@ georss-qld-bushfire-alert-client ]; "qnap" = ps: with ps; [ - ]; # missing inputs: qnapstats + qnapstats + ]; + "qnap_qsw" = ps: with ps; [ + aioqsw + ]; "qrcode" = ps: with ps; [ pillow pyzbar @@ -2115,9 +2126,11 @@ radiotherm ]; "rainbird" = ps: with ps; [ - ]; # missing inputs: pyrainbird + pyrainbird + ]; "raincloud" = ps: with ps; [ - ]; # missing inputs: raincloudy + raincloudy + ]; "rainforest_eagle" = ps: with ps; [ aioeagle ueagle @@ -2232,10 +2245,6 @@ "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ - aiohttp-cors - ifaddr - netdisco - zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ pyturbojpeg @@ -2309,6 +2318,10 @@ "sentry" = ps: with ps; [ sentry-sdk ]; + "senz" = ps: with ps; [ + aiohttp-cors + aiosenz + ]; "serial" = ps: with ps; [ pyserial-asyncio ]; @@ -2382,6 +2395,10 @@ ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api + "slimproto" = ps: with ps; [ + aiohttp-cors + aioslimproto + ]; "sma" = ps: with ps; [ pysma ]; @@ -2420,7 +2437,7 @@ paho-mqtt ]; "snmp" = ps: with ps; [ - pysnmp + pysnmplib ]; "solaredge" = ps: with ps; [ solaredge @@ -2747,6 +2764,9 @@ pytradfri ] ++ pytradfri.extras-require.async; + "trafikverket_ferry" = ps: with ps; [ + pytrafikverket + ]; "trafikverket_train" = ps: with ps; [ pytrafikverket ]; @@ -2828,11 +2848,10 @@ ]; "update" = ps: with ps; [ ]; - "updater" = ps: with ps; [ - ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client + getmac ifaddr zeroconf ]; @@ -3168,7 +3187,6 @@ "apprise" "aprs" "arcam_fmj" - "arlo" "aseko_pool_live" "asuswrt" "atag" @@ -3198,6 +3216,7 @@ "braviatv" "broadlink" "brother" + "brunt" "bsblan" "buienradar" "button" @@ -3436,6 +3455,7 @@ "manual_mqtt" "maxcube" "mazda" + "meater" "media_player" "media_source" "melcloud" @@ -3482,10 +3502,12 @@ "netgear" "network" "nexia" + "nextbus" "nightscout" "nina" "no_ip" "notify" + "notify_events" "notion" "nsw_rural_fire_service_feed" "nuki" @@ -3540,6 +3562,7 @@ "pvpc_hourly_pricing" "python_script" "qld_bushfire" + "qnap_qsw" "rachio" "radarr" "radio_browser" @@ -3582,6 +3605,7 @@ "sensibo" "sensor" "sentry" + "senz" "seventeentrack" "shell_command" "shelly" @@ -3595,6 +3619,7 @@ "siren" "slack" "sleepiq" + "slimproto" "sma" "smappee" "smart_meter_texas" @@ -3648,6 +3673,7 @@ "tailscale" "tankerkoenig" "tasmota" + "tautulli" "tcp" "telegram" "telegram_bot" @@ -3671,6 +3697,7 @@ "trace" "tractive" "tradfri" + "trafikverket_ferry" "trafikverket_train" "trafikverket_weatherstation" "transmission" @@ -3689,7 +3716,6 @@ "upb" "upcloud" "update" - "updater" "upnp" "uptime" "uptimerobot" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b29f48310d05f..61f207fadb182 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,7 +30,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") - (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=") # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { @@ -47,9 +46,21 @@ let aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + pynws = super.pynws.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -110,7 +121,7 @@ let src = fetchFromGitHub { owner = "ManneW"; repo = "vilfo-api-client-python"; - rev = "v$version}"; + rev = "v${version}"; sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; }; }); @@ -168,7 +179,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.4.7"; + hassVersion = "2022.5.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -186,7 +197,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M="; + hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index fb708313072ce..98fe3a04e2b05 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220405.0"; + version = "20220504.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg="; + sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 651c739886822..e02b54e9eef22 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -29,7 +29,8 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ das_j ]; + mainProgram = "icingacli"; + platforms = platforms.all; }; } diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index f3138915be0b1..6480e2425104a 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -142,13 +142,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY="; + sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl"; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix new file mode 100644 index 0000000000000..f160886fb6400 --- /dev/null +++ b/pkgs/servers/kanidm/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, formats +, nixosTests +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, udev +, openssl +, sqlite +, pam +}: + +let + arch = if stdenv.isx86_64 then "x86_64" else "generic"; +in +rustPlatform.buildRustPackage rec { + pname = "kanidm"; + version = "1.1.0-alpha.8"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-zMtbE6Y9wXFPBqhmiTMJ3m6bLVZl+c6lRY39DWDlJNo="; + }; + + cargoSha256 = "sha256:1l7xqp457zfd9gfjp6f4lzgadfp6112jbip4irazw4084qwj0z6x"; + + KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; + + postPatch = + let + format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; + profile = { + web_ui_pkg_path = "@web_ui_pkg_path@"; + cpu_flags = if stdenv.isx86_64 then "x86_64_v1" else "none"; + }; + in + '' + cp ${format profile} profiles/${KANIDM_BUILD_PROFILE}.toml + substituteInPlace profiles/${KANIDM_BUILD_PROFILE}.toml \ + --replace '@web_ui_pkg_path@' "$out/ui" + ''; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + udev + openssl + sqlite + pam + ]; + + # Failing tests, probably due to network issues + checkFlags = [ + "--skip default_entries" + "--skip oauth2_openid_basic_flow" + "--skip test_server" + "--skip test_cache" + ]; + + preFixup = '' + installShellCompletion --bash $releaseDir/build/completions/*.bash + installShellCompletion --zsh $releaseDir/build/completions/_* + + # PAM and NSS need fix library names + mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 + mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so + + # We don't compile the wasm-part form source, as there isn't a rustc for + # wasm32-unknown-unknown in nixpkgs yet. + cp -r kanidmd_web_ui/pkg $out/ui + ''; + + passthru.tests = { inherit (nixosTests) kanidm; }; + + meta = with lib; { + description = "A simple, secure and fast identity management platform"; + homepage = "https://github.com/kanidm/kanidm"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ erictapen Flakebi ]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix index 62b01cf9266c3..bda3f1cda4c41 100644 --- a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix +++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix @@ -22,9 +22,10 @@ buildGoModule rec { }; meta = with lib; { - homepage = "https://github.com/poolpOrg/filter-rspamd"; description = "OpenSMTPD filter integration for the Rspamd daemon"; + homepage = "https://github.com/poolpOrg/filter-rspamd"; license = licenses.isc; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "filter-rspamd"; }; } diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix index f8b0d8196fad1..9ec9ad01bc873 100644 --- a/pkgs/servers/mapserver/default.nix +++ b/pkgs/servers/mapserver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib -, withPython ? true, swig, python2 +, withPython ? true, swig, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional withPython swig; + ] ++ lib.optional withPython [ swig python3.pkgs.setuptools ]; buildInputs = [ cairo @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { proj protobufc zlib - ] ++ lib.optional withPython python2; + ] ++ lib.optional withPython python3; cmakeFlags = [ "-DWITH_KML=ON" diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index f955af78348e2..4c332b0865a47 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic ruamel-yaml unpaddedbase64 yarl diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 8c5310f6801ba..5d7550fe3cd67 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic qrcode ruamel-yaml unpaddedbase64 diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index bb52507dbaa7d..2d0ab908cb847 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec { sqlalchemy CommonMark ruamel-yaml - python_magic + python-magic tulir-telethon telethon-session-sqlalchemy pillow diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 6d63c6b1d668f..904b2182dbe68 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/prometheus-community/json_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; + mainProgram = "json_exporter"; }; } diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index 386e49594d248..748e135b63439 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/xperimental/nextcloud-exporter"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; + mainProgram = "nextcloud-exporter"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 4ef8fe9575f21..8e676b5022ae6 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,17 +2,25 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.59.0"; + version = "1.77.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; + sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs="; }; vendorSha256 = null; + postPatch = '' + # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package + # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web + # + # This appears to be some of test server for development purposes only. + rm -f app/vmui/packages/vmui/web/{go.mod,main.go} + ''; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; @@ -21,7 +29,7 @@ buildGoModule rec { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; - maintainers = [ maintainers.yorickvp ]; + maintainers = with maintainers; [ yorickvp ivan ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 52efdc148abb4..de6f28f30907c 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pkgs.git appdirs click - python_magic + python-magic requests termcolor toml diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index dd4025a76c09e..99dd29db14719 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,51 +1,22 @@ { lib, beamPackages , fetchFromGitHub, fetchFromGitLab -, file, cmake, bash +, file, cmake , nixosTests, writeText -, cookieFile ? null , ... }: beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; + sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U="; }; - preFixup = if (cookieFile != null) then '' - # There's no way to use a subprocess to cat the content of the - # file cookie using wrapProgram: it gets escaped (by design) with - # a pair of backticks :( - # We have to come up with our own custom wrapper to do this. - function wrapWithCookie () { - local hidden - hidden="$(dirname "$1")/.$(basename "$1")"-wrapped - while [ -e "$hidden" ]; do - hidden="''${hidden}_" - done - mv "$1" "''${hidden}" - - cat > "$1" << EOF - #!${bash}/bin/bash - export RELEASE_COOKIE="\$(cat "${cookieFile}")" - exec -a "\$0" "''${hidden}" "\$@" - EOF - chmod +x "$1" - } - - for f in "$out"/bin/*; do - if [[ -x "$f" ]]; then - wrapWithCookie "$f" - fi - done - '' else ""; - mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = (final: prev: { diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 31ab20c294092..9c512889531cc 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -1375,12 +1375,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.6.6"; + version = "0.7.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wrm3wx1c4wg8xj8lx1pg9xdpxhsbbry71l3kwgsizwjz1cc87if"; + sha256 = "sha256-aJTmihIPRUU02ZBF6jMl93QOpxJgvDFfguKXMdVwpug="; }; beamDeps = []; diff --git a/pkgs/servers/t-rex/default.nix b/pkgs/servers/t-rex/default.nix index 551282b605866..fb132da858769 100644 --- a/pkgs/servers/t-rex/default.nix +++ b/pkgs/servers/t-rex/default.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "t_rex"; platforms = platforms.unix; }; } diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix index b969902b253c7..4c41a7c9fde49 100644 --- a/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/UnifiedPush/common-proxies"; license = licenses.mit; maintainers = with maintainers; [ yuka ]; + mainProgram = "up_rewrite"; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 22abbdac08ce1..d154b1cee11cb 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -42,9 +42,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; - license = licenses.gpl2; homepage = "https://engelsystem.de"; + license = licenses.gpl2; maintainers = with maintainers; [ kloenk ]; + mainProgram = "migrate"; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 843e6f711654f..5526d8fe31f3e 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; + mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 2917c0e240089..5d01868725a8a 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -52,6 +52,7 @@ buildGoModule rec { homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ em0lar ]; + mainProgram = "vikunja"; platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index c0f94b1bca774..496bf02bb03aa 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.277"; + version = "2.5.279"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-YLw0DR4dbPfNY56lNybEQFXFEVPZ99sQkwDl6gtz40E="; + sha256 = "sha256-4QYNKvAEeRSJS9lO30bI/SnM9rLmuvRMR/LsGT77wvY="; }; sourceRoot = "."; diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index d35eb345dda91..0660bbe7e7b13 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { description = "A next-generation plugin manager for zsh"; homepage = "https://github.com/zplug/zplug"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.s1341 ]; + mainProgram = "zplug-env"; + platforms = platforms.all; }; } diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 6d8ea1a9de9dd..029950b9bee60 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2022-02-10"; + version = "unstable-2022-04-15"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "e8145d541a35d8a03df49fbbeefa50c4a0076bbf"; - sha256 = "h/3XP/BiNnUgQI29gEBl6RFee77WDhFyvsnTi1eRbKg="; + rev = "7e0eee64df6c7c81a57792674646b5feaf89f263"; + sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index be5c66505577d..9f88d972e7d28 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -25,10 +25,11 @@ buildGoModule rec { meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; - license = licenses.mit; homepage = "https://github.com/b4b4r07/history"; - platforms = platforms.unix; + license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "history"; + platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index f2914455246c2..5e9857134de50 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -24,6 +24,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( system.nixos = dummyVersioning; boot.loader.grub.enable = false; fileSystems."/".device = "/dev/null"; + system.stateVersion = lib.trivial.release; }).toplevel; nixosTest-test = pkgs.nixosTest ({ lib, pkgs, figlet, ... }: { @@ -31,6 +32,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( nodes.machine = { pkgs, ... }: { system.nixos = dummyVersioning; environment.systemPackages = [ pkgs.hello figlet ]; + system.stateVersion = lib.trivial.release; }; testScript = '' machine.succeed("hello | figlet >/dev/console") diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index a8ba509c78c9a..3b631c22d15d3 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.0.3"; + version = "0.6.0.4"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos="; + sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8="; }; debPkg = fetchurl { diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 8ead5fc8a1180..f0b5252950067 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -20,6 +20,7 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -27,7 +28,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 00ebb1ecec23e..d2236dfe354eb 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst +{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst , gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { @@ -10,7 +10,17 @@ stdenv.mkDerivation rec { sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; - patchPhase = + patches = [ + # Pull fix pending upstream inclusion for -fno-common + # toolchain support: https://savannah.gnu.org/bugs/?58810 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; + sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + }) + ]; + + postPatch = '' for i in `find cnee/test -name \*.sh` do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index af17f3ade7dc4..51ba815f1de45 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/soulthreads/xwinmosaic/pull/33 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch"; + sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 82b5773912015..35221b3fb5b50 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,25 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, aws-rotate-key }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-rotate-key"; - version = "1.0.6"; - - goPackagePath = "github.com/Fullscreen/aws-rotate-key"; + version = "1.0.8"; src = fetchFromGitHub { - rev = "v${version}"; owner = "Fullscreen"; repo = "aws-rotate-key"; - sha256 = "1w9704g1l2b0y6g6mk79g28kk0yaswpgljkk85d0i10wyxq4icby"; + rev = "v${version}"; + sha256 = "sha256-5kV87uQDSc/qpm79Pd2nXo/EcbMlhZqFYaw+gJQa2uo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-h7tmJx/Um1Cy/ojiFjoKCH/LcOwhGU8ADb5WwmrkkJM="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = aws-rotate-key; + }; meta = with lib; { description = "Easily rotate your AWS key"; homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; - maintainers = [maintainers.mbode]; + maintainers = [ maintainers.mbode ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/pkgs/tools/admin/aws-rotate-key/deps.nix deleted file mode 100644 index 680a18e7e2d38..0000000000000 --- a/pkgs/tools/admin/aws-rotate-key/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "af26abd521cd7697481572fdbc4a53cbea3dde1b"; - sha256 = "1yribbqy9i4i70dfg3yrjhkn3n0fywpr3kismn2mvi882mm01pxz"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "f844700ba2a387dfee7ab3679e7544b5dbd6d394"; - sha256 = "0s9100bzqj58nnax3dxfgi5qr4rbaa53cb0cj3s58k9jc9z6270m"; - }; - } -] diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index f746941a9533f..b65b4a8fbbbb4 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -226,8 +226,19 @@ let azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "7.0.0" "zip" "sha256-tF6CpZTtkc1ap6XNXQHwOLesPPEiM+e6K+qqNHeQDo4="; - azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" - "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; + azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { + version = "0.2.0"; + src = old.src.override { + inherit version; + sha256 = "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; + }; + propagatedBuildInputs = with self; [ + msrest + msrestazure + azure-common + azure-mgmt-nspkg + ]; + }); azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 996ab16360b11..de923d1f31187 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.95.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU="; + sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg="; }; - vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM="; + vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g="; doCheck = false; diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 60a7e0586f5fc..576df67ad5fd0 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -1,63 +1,68 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: let -py = python.override { - packageOverrides = self: super: { - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "6.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; - }; - doCheck = false; - postPatch = ""; - }); + python = python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); + requests-aws4auth = super.requests-aws4auth.overridePythonAttrs (old: { + doCheck = false; # requires click>=8.0 + }); + }; }; -}; -in - -with py.pkgs; -buildPythonApplication rec { +in python.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "5.8.1"; + version = "5.8.4"; + + format = "setuptools"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "v${version}"; - sha256 = "1shr9jslirjnbvma3p19djsnamxl7f3m9c8zrlclk57zv8rnwpkr"; + hash = "sha256-wSfd52jebUkgF5xhjcoUjI7j46eJF33pVb4Wrybq44g="; }; - # The test hangs so we disable it. - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "urllib3==1.26.4" "urllib3" + substituteInPlace setup.py \ + --replace "urllib3==1.26.4" "urllib3" \ + --replace "pyyaml==5.4.1" "pyyaml" + ''; - propagatedBuildInputs = [ - click - certifi - requests-aws4auth - pyopenssl - voluptuous - pyyaml + propagatedBuildInputs = with python.pkgs; [ elasticsearch + urllib3 + requests boto3 + requests-aws4auth + click + pyyaml + voluptuous + certifi + six ]; - checkInputs = [ - nosexcover - coverage - nose + checkInputs = with python.pkgs; [ mock - funcsigs + pytestCheckHook ]; - postPatch = '' - sed -i s/pyyaml==3.13/pyyaml/g setup.cfg setup.py - sed -i s/pyyaml==3.12/pyyaml/g setup.cfg setup.py - substituteInPlace setup.py \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - substituteInPlace setup.cfg \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - ''; + disabledTestPaths = [ + "test/integration" # requires running elasticsearch + ]; + + disabledTests = [ + # access network + "test_api_key_not_set" + "test_api_key_set" + ]; meta = with lib; { homepage = "https://github.com/elastic/curator"; @@ -76,8 +81,5 @@ buildPythonApplication rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; - - # https://github.com/elastic/curator/pull/1280 - #broken = versionAtLeast click.version "7.0"; }; } diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index b05f338042610..a745c693305cc 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,33 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "exoscale-cli"; - version = "1.52.1"; + version = "1.54.0"; src = fetchFromGitHub { - owner = "exoscale"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-CSltvSdKLAH711ubT6ROgkmq2EcFJplPmavsJa9xupM="; + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-uvPJ1cOKMpDf1KfEPkSTWMIMNojUlfpqI1ESomX1MlM="; }; - goPackagePath = "github.com/exoscale/cli"; + vendorSha256 = null; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; + excludedPackages = [ "./completion" "./docs" ]; - # ensures only the cli binary is built and we don't clutter bin/ with submodules - subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; # we need to rename the resulting binary but can't use buildFlags with -o here # because these are passed to "go install" which does not recognize -o postBuild = '' - mv go/bin/cli go/bin/exo + mv $GOPATH/bin/cli $GOPATH/bin/exo ''; meta = { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; - homepage = "https://github.com/exoscale/cli"; - license = lib.licenses.asl20; + homepage = "https://github.com/exoscale/cli"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dramaturg ]; mainProgram = "exo"; }; diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index af2f1ee352af3..359427d32a0d7 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "381.0.0"; + version = "384.0.1"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86_64.tar.gz"; - sha256 = "1m5npilxagnl8zdx2i5vgcgalbcsnd4zvi0f2y5ic3dlfgibmlxb"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86_64.tar.gz"; + sha256 = "1pa6dzizn7sjahghiwz98n906ssbq4aa9kg1f3akdsmmabh95pd7"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-x86_64.tar.gz"; - sha256 = "0vdbm2pl2wbyrdlf5dxs0djs6dn7kv17qvl8jxca8ylz2k296a0x"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-x86_64.tar.gz"; + sha256 = "0pis92ldxxzvsamkck54d5d86ss13wipji29x082750c54gwm6w3"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-arm.tar.gz"; - sha256 = "03mkhp7kvakv8bzpj9yk9anj8y5k7iina876f7dcsbm9fiwl4g9w"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-arm.tar.gz"; + sha256 = "1ssxb126hjyylgjbybl7ksiqnwf2hz6y0x1s5rjicaqpw5yv0sqy"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-arm.tar.gz"; - sha256 = "1dsfn7rdmg1m7d9cfirl6xsdwzbzh6v62xp6nd9b17s05d4sh0kl"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-arm.tar.gz"; + sha256 = "1qxhl7c1ii44drls2mpmm03n2j7274dxcsf5inrhyjgs94yl5h7b"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86.tar.gz"; - sha256 = "0y95lvky62f7pfz4g3476ci239p5c8q9p9l2xh59x38xaa69gnvb"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86.tar.gz"; + sha256 = "1gghl16bdc9vgd2p834vd2i6av81q15czi7arpnmgg9n5dl3i2c8"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index b26950087a1d7..6402e3f32dfbe 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="381.0.0" +VERSION="384.0.1" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 48cb73be8310e..0b32c23f65aad 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -48,6 +48,7 @@ buildGo118Package rec { ''; passthru.tests.lxd = nixosTests.lxd; + passthru.tests.lxd-nftables = nixosTests.lxd-nftables; nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 11c748f5d64ee..0f7d3806182a5 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.44.1"; + version = "0.45.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U="; + sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI="; + vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index fcc92e673a551..9be1ea7f4d440 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; - longDescription = '' The Tar program provides the ability to create tar archives, as well as various other kinds of manipulation. For example, you @@ -62,10 +60,12 @@ stdenv.mkDerivation rec { pipes), it can even access remote devices or files (as archives). ''; + homepage = "https://www.gnu.org/software/tar/"; license = lib.licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "tar"; platforms = lib.platforms.all; priority = 10; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cd2661128a9a0..c50a49255c9f9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.04.28"; + version = "2022.05.05"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-a/zFCxdy+GTh5daZO7QBHWeeJ1dead3Dn7dk02jBnc0="; + hash = "sha256-QGCws+S6Mfv0uQcfKg2DbRWS34UAeG17Z+YAyswVAFc="; }; meta = with lib; { diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 60585c3b35411..0f13addfcd92e 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite glib curl ]; meta = with lib; { - license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = "https://github.com/sahib/glyr"; + license = licenses.lgpl3; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "glyrc"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix new file mode 100644 index 0000000000000..2e4f631851900 --- /dev/null +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3 +, gobject-introspection, libayatana-appindicator-gtk3 }: + +stdenv.mkDerivation rec { + # The last versioned release is 1.0.0.0 from 2020, since then there were updates but no versioned release. + # This is not marked unstable because upstream encourages installation from source. + pname = "headset-charge-indicator"; + version = "2021-08-15"; + + src = fetchFromGitHub { + owner = "centic9"; + repo = "headset-charge-indicator"; + rev = "6e20f81a4d6118c7385b831044c468af83103193"; + sha256 = "sha256-eaAbqeFY+B3CcKJywC3vaRsWZNQENTbALc7L7uW0W6U="; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ + (python3.withPackages (ps: with ps; [ pygobject3 ])) + headsetcontrol + gtk3 + gobject-introspection + libayatana-appindicator-gtk3 + ]; + + installPhase = '' + mkdir -p $out/bin + cp $src/headset-charge-indicator.py $out/bin/headset-charge-indicator.py + chmod +x $out/bin/headset-charge-indicator.py + + substituteInPlace \ + $out/bin/headset-charge-indicator.py \ + --replace "default='headsetcontrol'" "default='${headsetcontrol}/bin/headsetcontrol'" + + cat << EOF > ${pname}.desktop + [Desktop Entry] + Name=Wireless headset app-indicator + Categories=Application;System + Exec=$out/bin/headset-charge-indicator.py + Terminal=false + Type=Application + X-GNOME-AutoRestart=true + X-GNOME-Autostart-enabled=true + EOF + + mkdir -p $out/share/applications + mkdir -p $out/etc/xdg/autostart + cp ${pname}.desktop $out/share/applications/${pname}.desktop + cp ${pname}.desktop $out/etc/xdg/autostart/${pname}.desktop + ''; + + meta = with lib; { + homepage = "https://github.com/centic9/headset-charge-indicator"; + description = + "A app-indicator for GNOME desktops for controlling some features of various wireless headsets"; + longDescription = + "A simple app-indicator for GNOME desktops to display the battery charge of some wireless headsets which also allows to control some functions like LEDs, sidetone and others."; + platforms = platforms.linux; + maintainers = with maintainers; [ zebreus ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index d7b6af031644c..45a359e0aadbc 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0eq2u3DCNgfxsiE4lycf+xGIoEC3sZgEMha9+40j+9s="; + sha256 = "sha256-UUK5C26wM8LKQ7TE6DWEfzq+uPXH09B2Nybkfuqk+1o="; }; - vendorSha256 = "sha256-qYXdRpQT7x+Y5h8PuKGjsANXLqjNlsPKO76GQhnufTU="; + vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/cupcakearmy/autorestic"; license = licenses.asl20; maintainers = with maintainers; [ renesat ]; - platforms = platforms.linux ++ platforms.darwin; + mainProgram = "autorestic"; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index fbaab91d0931b..27d0141ff75b3 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index 03366e5b1ce3e..2ac8398dbc2df 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; + mainProgram = "xdelta3"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index fad1944c4a0eb..f9e5340802eda 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, pkg-config, python3, sphinx , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs +, gitUpdater }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.2"; + version = "5.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; + sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4="; }; nativeBuildInputs = [ - pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config python3 python3.pkgs.setuptools + sphinx ]; buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; @@ -47,6 +49,14 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; + + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://github.com/kdave/btrfs-progs.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index e5e873b9ac564..f5eb62cca56e4 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "netatalk"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; - sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; + sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; }; patches = [ diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index e81414a2595f1..c44157a2f026f 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk"; + hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index 43824e1690477..4ca4cd9a0346c 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: +{ lib, stdenv, fetchFromSourcehut, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; version = "1.4.0"; - src = fetchFromGitHub { - owner = "emersion"; + src = fetchFromSourcehut { + owner = "~emersion"; repo = pname; rev = "v${version}"; sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w="; diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 1ac061034d754..0a1ce3108f231 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -34,9 +34,9 @@ # https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 # The names are prefixed with input_remapper to avoid potential # collisions with package names -, input_remapper_version ? "unstable-2022-02-09" -, input_remapper_src_rev ? "55227e0b5a28d21d7333c6c8ea1c691e56fd35c4" -, input_remapper_src_hash ? "sha256-kzGlEaYN/JfAgbI0aMLr5mwObYOL43X7QU/ihDEBQFg=" +, input_remapper_version ? "1.4.2" +, input_remapper_src_rev ? "af20f87a1298153e765b840a2164ba63b9ef937a" +, input_remapper_src_hash ? "sha256-eG4Fx1z74Bq1HrfmzOuULQLziGdWnHLax8y2dymjWsI=" }: let diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 379ed14f8ef69..beebae6542b97 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -38,6 +38,7 @@ buildRubyGem rec { homepage = "https://anystyle.io/"; license = licenses.bsd2; maintainers = with maintainers; [ shamilton ]; + mainProgram = "anystyle"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index f7d3daf9fbcc5..d1bb7d85d18f1 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.11.0"; + version = "0.12.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kwJ4/jkVVgem5Lb+uFDFPk4/6WWSWJs+SQDSyKkhG/8="; + sha256 = "sha256-SmzsFXS/geFpssy18pIluoCYGsJql9TAgYUNgAZlXmI="; }; - cargoSha256 = "sha256-kJ81kY2EmkH3yu8xL1aPxXPMhkDsGKWo0RWn1Ih7z2k="; + cargoSha256 = "sha256-bL79CW6X9pHx/Cn58KDxf8bVDwvrGRKkK9v/+Ygp5D4="; prePatch = '' rm .cargo/config.toml diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix index 065c21e3f78e9..bad5b4d9a89fe 100644 --- a/pkgs/tools/misc/bsp-layout/default.nix +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, lib, bspwm, makeWrapper, git, bc }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, git +, bc +, bspwm +}: stdenv.mkDerivation rec { pname = "bsp-layout"; @@ -17,14 +24,22 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' - substituteInPlace $out/bin/bsp-layout --replace 'bc ' '${bc}/bin/bc ' + substituteInPlace $out/lib/bsp-layout/layout.sh --replace 'bc ' '${bc}/bin/bc ' + for layout in tall rtall wide rwide + do + substituteInPlace "$out/lib/bsp-layout/layouts/$layout.sh" --replace 'bc ' '${bc}/bin/bc ' + done ''; meta = with lib; { description = "Manage layouts in bspwm"; + longDescription = '' + bsp-layout is a dynamic layout manager for bspwm, written in bash. + It provides layout options to fit most workflows. + ''; homepage = "https://github.com/phenax/bsp-layout"; license = licenses.mit; - maintainers = with maintainers; [ devins2518 ]; + maintainers = with maintainers; [ devins2518 totoroot ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 8afb103e9d497..e23471fc96d86 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.56"; + version = "3.2.57"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03"; + sha256 = "ef7f564ec2cd8baaf94a44982ce1db88c1192696617f21538d0b8472a63b4c2b"; }; patches = lib.optionals nixos-extensions [ @@ -28,9 +28,6 @@ mkDerivation rec { ./nonroot.patch # Adds unfree qml to packagechooserq ./unfreeq.patch - # Adds config to change name of packagechooserq - # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932 - ./packagechooserq.patch # Modifies finished module to add some NixOS resources # Modifies packagechooser module to change the UI ./uimod.patch diff --git a/pkgs/tools/misc/calamares/packagechooserq.patch b/pkgs/tools/misc/calamares/packagechooserq.patch deleted file mode 100644 index 90a7b22de8b54..0000000000000 --- a/pkgs/tools/misc/calamares/packagechooserq.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp -index 491fe5c25..667621597 100644 ---- a/src/modules/packagechooser/Config.cpp -+++ b/src/modules/packagechooser/Config.cpp -@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice ) - emit packageChoiceChanged( m_packageChoice.value_or( QString() ) ); - } - -+QString -+Config::prettyName() const -+{ -+ return m_stepName ? m_stepName->get() : tr( "Packages" ); -+} -+ - QString - Config::prettyStatus() const - { -@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) - cWarning() << "Single-selection QML module must use 'Legacy' method."; - } - } -+ -+ bool labels_ok = false; -+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); -+ if ( labels_ok ) -+ { -+ if ( labels.contains( "step" ) ) -+ { -+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); -+ } -+ } - } -diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h -index b04b1c30b..d1b783a8d 100644 ---- a/src/modules/packagechooser/Config.h -+++ b/src/modules/packagechooser/Config.h -@@ -98,6 +98,7 @@ public: - QString packageChoice() const { return m_packageChoice.value_or( QString() ); } - void setPackageChoice( const QString& packageChoice ); - -+ QString prettyName() const; - QString prettyStatus() const; - - signals: -@@ -120,6 +121,7 @@ private: - * Reading the property will return an empty QString. - */ - std::optional< QString > m_packageChoice; -+ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar - }; - - -diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp -index 9057004de..8eacf82ec 100644 ---- a/src/modules/packagechooser/PackageChooserViewStep.cpp -+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp -@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) - : Calamares::ViewStep( parent ) - , m_config( new Config( this ) ) - , m_widget( nullptr ) -- , m_stepName( nullptr ) - { - emit nextStatusChanged( false ); - } -@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep() - { - m_widget->deleteLater(); - } -- delete m_stepName; - } - -- - QString - PackageChooserViewStep::prettyName() const - { -- return m_stepName ? m_stepName->get() : tr( "Packages" ); -+ return m_config->prettyName(); - } - - -@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap - m_config->setDefaultId( moduleInstanceKey() ); - m_config->setConfigurationMap( configurationMap ); - -- bool labels_ok = false; -- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); -- if ( labels_ok ) -- { -- if ( labels.contains( "step" ) ) -- { -- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); -- } -- } -- - if ( m_widget ) - { - hookupModel(); -diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h -index 7561f2bd7..76b35aed8 100644 ---- a/src/modules/packagechooser/PackageChooserViewStep.h -+++ b/src/modules/packagechooser/PackageChooserViewStep.h -@@ -50,7 +50,6 @@ private: - - Config* m_config; - PackageChooserPage* m_widget; -- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar - }; - - CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory ) -diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp -index 543c9771d..7c4d5fda7 100644 ---- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp -+++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp -@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent ) - QString - PackageChooserQmlViewStep::prettyName() const - { -- return tr( "Packages" ); -+ return m_config->prettyName(); - } - - QString -@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration - m_config->setDefaultId( moduleInstanceKey() ); - m_config->setConfigurationMap( configurationMap ); - Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last -+ /*bool labels_ok = false; -+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); -+ if ( labels_ok ) -+ { -+ if ( labels.contains( "step" ) ) -+ { -+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" ); -+ } -+ }*/ - } diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index cd7b8270a1a96..3839d117afd00 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hisbaan/didyoumean"; license = licenses.gpl3Plus; maintainers = with maintainers; [ evanjs ]; + mainProgram = "dym"; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 92fc69be7b5d7..a3f5c44781a80 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python_magic progressbar33 pypdf2 rpm tlsh + python-magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals enableBloat ([ diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 624236462c2fe..92f32a215a564 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -49,6 +49,6 @@ buildGoModule rec { ''; homepage = "https://direnv.net"; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = teams.numtide.members; }; } diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/tools/misc/go.rice/default.nix index 771f3493157c7..e608ad121ccab 100644 --- a/pkgs/tools/misc/go.rice/default.nix +++ b/pkgs/tools/misc/go.rice/default.nix @@ -16,9 +16,10 @@ buildGoModule rec { subPackages = [ "." "rice" ]; meta = with lib; { - homepage = "https://github.com/GeertJohan/go.rice"; description = "A Go package that makes working with resources such as html, js, css, images, templates very easy"; + homepage = "https://github.com/GeertJohan/go.rice"; license = licenses.bsd2; maintainers = with maintainers; [ blaggacao ]; + mainProgram = "rice"; }; } diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 1480f099f9f57..5db9e8f00fb20 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { description = "Open source log management solution"; homepage = "https://www.graylog.org/"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; + mainProgram = "graylogctl"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/lookatme/default.nix b/pkgs/tools/misc/lookatme/default.nix deleted file mode 100644 index 7d2f7338ec24a..0000000000000 --- a/pkgs/tools/misc/lookatme/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, python3, fetchFromGitHub }: - -let - py = python3.override { - packageOverrides = self: super: { - self = py; - # use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; - # needs pyyaml 5 - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "5.4.1"; - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM="; - }; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all - runHook postCheck - ''; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { - pname = "lookatme"; - version = "2.3.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw="; - }; - - checkInputs = [ - pytest-mock - pytestCheckHook - six - ]; - - disabledTests = [ - # https://github.com/d0c-s4vage/lookatme/issues/126 - "test_sanity_check_that_errors_are_detected" - "test_styles_defaults" - ]; - - propagatedBuildInputs = [ - click - pyyaml - pygments - marshmallow - mistune - urwid - ]; - - meta = with lib; { - description = "An interactive, terminal-based markdown presenter"; - homepage = "https://github.com/d0c-s4vage/lookatme"; - license = licenses.mit; - maintainers = with maintainers; [ ameer ]; - }; -} diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix index a02994f33a07b..f483b699266d4 100644 --- a/pkgs/tools/misc/melody/default.nix +++ b/pkgs/tools/misc/melody/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "melody"; - version = "0.13.10"; + version = "0.18.0"; src = fetchCrate { pname = "melody_cli"; inherit version; - sha256 = "05slrh5dqbpsvimdr0rlhj04kf1qzwij3zlardvbmvhvfccf4188"; + sha256 = "1shd5m9sj9ybjzq26ipggfbc22lyzkdzq2kirgfvdk16m5r3jy2v"; }; - cargoSha256 = "0qh1byysbc6pl3cvx2vdpl8crx5id59hhrwqzk5g7091spm8wf79"; + cargoSha256 = "0wz696zz7gm36dy3lxxwsiriqxk0nisdwybvknn9a38rvzd6jjbm"; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 564e1989aee80..2172b8b958c63 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mmake"; - version = "1.2.0"; - - goPackagePath = "github.com/tj/mmake"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tj"; repo = "mmake"; rev = "v${version}"; - sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f"; + sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; meta = with lib; { homepage = "https://github.com/tj/mmake"; @@ -23,7 +25,7 @@ buildGoPackage rec { functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make. - ''; + ''; license = licenses.mit; maintainers = [ maintainers.gabesoft ]; }; diff --git a/pkgs/tools/misc/mmake/deps.nix b/pkgs/tools/misc/mmake/deps.nix deleted file mode 100644 index 0721ad0af6088..0000000000000 --- a/pkgs/tools/misc/mmake/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/apex/log"; - fetch = { - type = "git"; - url = "https://github.com/apex/log"; - rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be"; - sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/segmentio/go-env"; - fetch = { - type = "git"; - url = "https://github.com/segmentio/go-env"; - rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876"; - sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq"; - }; - } -] diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 680e373876838..d3e24c5598493 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; license = lib.licenses.bsdOriginal; + mainProgram = "mysql2psql"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 77af8d5d788b3..64632986638d3 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -4,13 +4,13 @@ stdenvNoCC.mkDerivation rec { pname = "neofetch"; - version = "unstable-2020-11-26"; + version = "unstable-2020-12-10"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; - rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f"; - sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE="; + rev = "ccd5d9f52609bbdcd5d8fa78c4fdb0f12954125f"; + sha256 = "sha256-9MoX6ykqvd2iB0VrZCfhSyhtztMpBTukeKejfAWYW1w="; }; patches = [ diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 384c448e1d933..e158f1c3f44a7 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -31,8 +31,6 @@ buildGoModule rec { ]; meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; - changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; description = "OpenTelemetry Collector superset with additional community collectors"; longDescription = '' The OpenTelemetry Collector offers a vendor-agnostic implementation on how @@ -44,7 +42,10 @@ buildGoModule rec { components that are only useful to a relatively small number of users and is multiple times larger as a result. ''; + homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; + changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ uri-canva jk ]; + mainProgram = "otelcontribcol"; }; } diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index df211378f4b43..f85490736d9f3 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -13,7 +13,7 @@ with python3Packages; buildPythonPackage rec { pname = "pre-commit"; - version = "2.18.1"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "pre-commit"; rev = "v${version}"; - sha256 = "sha256-d/ukUTjNgpqr6IeDJHDaOXQm0EdsX+vq0sVX7HG3gSE="; + sha256 = "sha256-5YV0FJhHiq/NJFKYvwddIWUQVxKJpnIJLLNmyY0NX4A="; }; patches = [ diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 29775881378dd..c392dd2802728 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -1,18 +1,18 @@ { lib -, buildGoModule +, buildGo118Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo118Module rec { pname = "upterm"; - version = "0.7.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-eEzFqKYhsG5e1DVLWJq08NM9xyfn1yPNV0NIgOErj4E="; + hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix new file mode 100644 index 0000000000000..1aac4c5c80242 --- /dev/null +++ b/pkgs/tools/misc/usbimager/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitLab, pkg-config +, withLibui ? true, gtk3 +, withUdisks ? stdenv.isLinux, udisks, glib +, libX11 }: + +stdenv.mkDerivation rec { + pname = "usbimager"; + version = "1.0.8"; + + src = fetchFromGitLab { + owner = "bztsrc"; + repo = pname; + rev = version; + sha256 = "1j0g1anmdwc3pap3m4kfzqjfkn7q0vpmqniii2kcz7svs5h3ybga"; + }; + + sourceRoot = "source/src/"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals withUdisks [ udisks glib ] + ++ lib.optional (!withLibui) libX11 + ++ lib.optional withLibui gtk3; + # libui is bundled with the source of usbimager as a compiled static libary + + postPatch = '' + sed -i \ + -e 's|install -m 2755 -g disk|install |g' \ + -e 's|-I/usr/include/gio-unix-2.0|-I${glib.dev}/include/gio-unix-2.0|g' \ + -e 's|install -m 2755 -g $(GRP)|install |g' Makefile + ''; + + dontConfigure = true; + + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional withLibui "USE_LIBUI=yes" + ++ lib.optional withUdisks "USE_UDISKS2=yes"; + + meta = with lib; { + description = "A very minimal GUI app that can write compressed disk images to USB drives"; + homepage = "https://gitlab.com/bztsrc/usbimager"; + license = licenses.mit; + maintainers = with maintainers; [ vdot0x23 ]; + # windows and darwin could work, but untested + # feel free add them if you have a machine to test + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ec9958ec54587..3375f4507bd25 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -30,7 +30,7 @@ let pname = "vector"; - version = "0.21.1"; + version = "0.21.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eskm+H0D+SB3PB76T6Z+iL5jjyy51lOXy88QXsn/Azs="; + sha256 = "sha256-2iMD3QpVm1YmiEH17PdjgiNoD2Gt9BRJ5soMDB//b3Y="; }; - cargoSha256 = "sha256-fN6o8Fcqdhs5c3RID+ok1Xo5g6nF9m3f8EWIJ47dn/k="; + cargoSha256 = "sha256-OkK0COSHdZ6fHWUrZ90ltuFSCtVZ14QZiIWVwkHOvq8="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage { buildFeatures = features; # TODO investigate compilation failure for tests - # there are about 100 tests failing (out of 1100) for version 0.21.1 + # there are about 100 tests failing (out of 1100) for version 0.21.2 doCheck = false; checkFlags = [ diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index de746f39b4779..26a80c6a65913 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { to install the wakatime CLI interface manually. ''; license = licenses.bsd3; + mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 51cfda5e0aa13..d16410c315385 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; + mainProgram = "zsh-autoenv-share"; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 412b3e0349c0d..ec0ca52535402 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4YSCVZkNung4frgAeP46E9Ptpnu9y0HwmPRADo4t0U="; + sha256 = "sha256-m2uKTVRonnun+/V69RcPWkkRtDcoaiulMCQz0/CAdCw="; }; - cargoHash = "sha256-fu7ZopS55IzzeO7uzLx1wVHQ8A1Ff+9f7FagoZPerxk="; + cargoHash = "sha256-Z/OZgWlpwcdqns26ojTLPQBVNrwU/i86tZVx19sRUTw="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index df383409f4d2d..51ace3ac9a0bf 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "brook"; - version = "20220406"; + version = "20220501"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk="; + sha256 = "sha256-JAlSqwhWsF8PTAyn2W1BCDO50eSBq7ukwl0dzzmK1zU="; }; vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 3116644eb68bd..fba769d2a5549 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2ElEhKit/XysRsUw+dg7SnhDl+Zf+FJb5pIYpq1ALNs="; + sha256 = "sha256-M0jsCwle57YM0RO1hGMju5+8XvHPWc8tJqKWJL/sFsg="; }; - cargoHash = "sha256-w3qz4ygjIvn+Rxd1JEVO6Ax08leuuJvC4Bk7VygbBh4="; + cargoHash = "sha256-zTgHjDZdsseUpB5Xqn9yE5T6Tgqx22pQKQLlUtZq+lc="; nativeBuildInputs = [ installShellFiles mandown ]; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 8b75db6495f70..93fd87b005b58 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -1,51 +1,59 @@ -{ lib, stdenv -, autoreconfHook -, fetchFromGitHub -, fetchpatch +{ stdenv +, lib +, fetchurl , file , glib , gnome , gtk3 +, gtk4 , intltool , libnma +, libnma-gtk4 , libsecret , networkmanager , pkg-config , ppp , sstp -, substituteAll -, withGnome ? true }: +, withGnome ? true +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; - version = "unstable-2020-04-20"; -in stdenv.mkDerivation { + version = "1.3.0"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - src = fetchFromGitHub { - owner = "enaess"; - repo = "network-manager-sstp"; - rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8"; - sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "+IJw3jvOYs/+NDS9HvCrSQ6wxh1x1yqwiFij7UZb+rU="; }; - buildInputs = [ sstp networkmanager glib ppp ] - ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + file + intltool + pkg-config + ]; - nativeBuildInputs = [ file intltool autoreconfHook pkg-config ]; + buildInputs = [ + sstp + networkmanager + glib + ppp + ] ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; postPatch = '' sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c ''; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - - preConfigure = "intltoolize"; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" + "--with-gtk4=${if withGnome then "yes" else "no"}" "--enable-absolute-paths" ]; diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 64e601c375c6a..d279f06173753 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -16,5 +16,6 @@ buildGoModule rec { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "obfs4proxy"; }; } diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index b6feafb4a0039..01c5b63767655 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "ooniprobe"; }; } diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 88af5a136251b..a73d39b5126a5 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python-magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; }; - propagatedBuildInputs = [ python_magic python-dateutil ]; + propagatedBuildInputs = [ python-magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 44546465d9ee0..158cac0a734bd 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "https://github.com/sleinen/samplicator/"; license = lib.licenses.gpl2Plus; + mainProgram = "samplicate"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 25e426dc43e3e..ed6a817058cd3 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.mit; maintainers = [ lib.maintainers.qyliss ]; + mainProgram = "slack"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index fdaf0dc177f3e..34f0936876054 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU="; + sha256 = "sha256-uVd1qPNBIqs9+pRnRP/Q8Z5sXpRdcwBejKjt0BJbXWA="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 2387c903a9b0f..2ca679b16c856 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; homepage="http://www.tinc-vpn.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "tincd"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index e20f36b1ef991..a33833a230d54 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nix-community/nixos-generators"; license = licenses.mit; maintainers = with maintainers; [ lassulus ]; + mainProgram = "nixos-generate"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index e7b6b3adf1f27..b8810ad36dfc1 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,28 +1,25 @@ -{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: +{ buildGoModule, fetchFromGitHub, lib, makeWrapper, openssh }: buildGoModule rec { pname = "morph"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8"; + sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; }; vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; - nativeBuildInputs = [ makeWrapper go-bindata ]; + nativeBuildInputs = [ makeWrapper ]; ldflags = [ "-X main.version=${version}" + "-X main.assetRoot=${placeholder "lib"}" ]; - postPatch = '' - go-bindata -pkg assets -o assets/assets.go data/ - ''; - postInstall = '' mkdir -p $lib cp -v ./data/*.nix $lib diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index cf9b26a5603ac..b7fe55f8b41fc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -89,12 +89,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220503_${lib.substring 0 7 src.rev}"; + suffix = "pre20220505_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e"; - sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4="; + rev = "f4102de84ba4dd3b845a3e34fabab5400e066ad0"; + sha256 = "sha256-g3GDM8MSzJ27hJoGWj2QGjINZP/I1KCJpZZn+iPMmfM="; }; }); }) diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index ba80734e5cf81..ae831bf86753e 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation { supergenpass will ask for your master password interactively, and it will not be displayed on your terminal. ''; + homepage = "https://github.com/lanzz/bash-supergenpass"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://github.com/lanzz/bash-supergenpass"; + mainProgram = "supergenpass"; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix new file mode 100644 index 0000000000000..fc78f7c213741 --- /dev/null +++ b/pkgs/tools/security/dieharder/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, gsl +, dieharder, testers }: + +stdenv.mkDerivation rec { + pname = "dieharder"; + version = "3.31.1"; + + src = fetchurl { + url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${version}.tgz"; + hash = "sha256-bP8P+DlMVTVJrHQzNZzPyVX7JnlCYDFGIN+l5M1Lcn8="; + }; + + patches = [ + # Include missing stdint.h header + ./stdint.patch + ]; + + buildInputs = [ gsl ]; + + passthru = { + tests.version = testers.testVersion { package = dieharder; }; + }; + + meta = with lib; { + description = "A Random Number Generator test suite"; + homepage = "https://webhome.phy.duke.edu/~rgb/General/dieharder.php"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zhaofengli ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/dieharder/stdint.patch b/pkgs/tools/security/dieharder/stdint.patch new file mode 100644 index 0000000000000..91dccfafd6652 --- /dev/null +++ b/pkgs/tools/security/dieharder/stdint.patch @@ -0,0 +1,10 @@ +--- a/include/dieharder/libdieharder.h 2011-10-14 15:41:37.000000000 +0200 ++++ b/include/dieharder/libdieharder.h 2015-03-27 16:34:40.978860858 +0100 +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <stdarg.h> + #include <string.h> ++#include <stdint.h> + #include <sys/time.h> + + /* This turns on uint macro in c99 */ diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 6bdac96811a08..0a43260eb8315 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -1,14 +1,17 @@ { lib, stdenv, pkgs }: -stdenv.mkDerivation { - version = "0.4.0"; +let pname = "ecdsautils"; + version = "0.4.1"; +in +stdenv.mkDerivation { + inherit pname version; src = pkgs.fetchFromGitHub { owner = "freifunk-gluon"; - repo = "ecdsautils"; - rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46"; - sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dv0guQTmot5UO1GkMgzvD6uJFyum5kV89LI3xWS1DZA="; }; nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; @@ -16,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; - homepage = "https://github.com/tcatm/ecdsautils/"; + homepage = "https://github.com/freifunk-gluon/ecdsautils/"; license = with licenses; [ mit bsd2 ]; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/tools/security/erosmb/default.nix new file mode 100644 index 0000000000000..c0b4586c3524e --- /dev/null +++ b/pkgs/tools/security/erosmb/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "erosmb"; + version = "0.1.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "viktor02"; + repo = "EroSmb"; + rev = "v${version}"; + hash = "sha256-d7iSl7weIHWXDnMYQKxafVd5JrZ0fnuWRDpEirBVdcg="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + chardet + colorama + cryptography + impacket + ldap3 + ldapdomaindump + pyasn1 + setuptools + six + ]; + + # Project has no tests + doCheck = false; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/erosmb --help + runHook postInstallCheck + ''; + + meta = with lib; { + description = "SMB network scanner"; + homepage = "https://github.com/viktor02/EroSmb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 0b67babddef26..596eb7f6e50dc 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw="; + sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18="; # 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; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI="; + vendorSha256 = "sha256-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix index 8116c222d077c..2c584f35ff4fe 100644 --- a/pkgs/tools/security/hfinger/default.nix +++ b/pkgs/tools/security/hfinger/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ fnvhash - python_magic + python-magic ] ++ [ wireshark-cli ]; diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index cbd4e4e3150f4..0f82cc0cbab74 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kube-hunter"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-W7jW0V91o164EIAzZ7ODWeqTmUaUFDIqlE37x/AycqY="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 83534ca07c6b0..5624608734c75 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.40" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.41" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 779d1f9c99745..66826c4e1f718 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 82d111481b8f46bf50473770673305b0ec0eb5d2 - ref: refs/tags/6.1.40 + revision: 4ecb04311be0dd55fbf66e6d05fa8b37135c5573 + ref: refs/tags/6.1.41 specs: - metasploit-framework (6.1.40) + metasploit-framework (6.1.41) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.83) + metasploit-payloads (= 2.0.87) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.581.0) + aws-partitions (1.586.0) aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.309.0) + aws-sdk-ec2 (1.312.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -144,7 +144,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.2) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -254,7 +254,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.83) + metasploit-payloads (2.0.87) metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) @@ -287,7 +287,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.4) + nokogiri (1.13.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) @@ -373,7 +373,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.35) + rex-socket (0.1.38) rex-core rex-sslscan (0.1.7) rex-core @@ -388,7 +388,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.1.1) + ruby_smb (3.1.2) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7fc91f012db96..30c9997f416ff 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.40"; + version = "6.1.41"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-3aQwzFaEANgc2inlZd2huu9W3vpv9bgIeRib4Q2zI3I="; + sha256 = "sha256-lm7YCvlwdialifh1IZrP+T8iB9g6BxUr2OEMd2ebyTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 383456bcf3789..ace1051bd69f2 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn84zn8g8aaqq9cmc2mkaakpgysl50mnhalzphxxvamg9pah5hq"; + sha256 = "1sgkw3hnpcq3m5drc8zyv2sj3lkm3v8658nxjy53j0gdpzkxg3as"; type = "gem"; }; - version = "1.581.0"; + version = "1.586.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fw7sxwn5k9a944j0010kn6dl93fv10q1f8kmvdkb4i231xbxwl"; + sha256 = "13jgjfhi3wpvb9j852pwbm3qng3zb31bdjbfbfyz5nwqip90pc1m"; type = "gem"; }; - version = "1.309.0"; + version = "1.312.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.113.2"; + version = "1.114.0"; }; aws-sigv4 = { groups = ["default"]; @@ -694,12 +694,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "82d111481b8f46bf50473770673305b0ec0eb5d2"; - sha256 = "0wi3nc6y36qqg44bixbgzbg5dvxsl7fnbr99v8fdh044av63196x"; + rev = "4ecb04311be0dd55fbf66e6d05fa8b37135c5573"; + sha256 = "0f69kdkpf371v0mia1rsv03j4gzrryd22xgqi6jjcxkhz45dhvln"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.40"; + version = "6.1.41"; }; metasploit-model = { groups = ["default"]; @@ -716,10 +716,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vlazx39flz2pci2yqjcgd4ljslhivbq1vvyajgsxl15q772ni0"; + sha256 = "0dj3vxv17wfjgv24n5wwij2vlbk83s8d69rpxzmkbjpi6qscw17x"; type = "gem"; }; - version = "2.0.83"; + version = "2.0.87"; }; metasploit_data_models = { groups = ["default"]; @@ -907,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "0y0yfi1y9ywdih7c0lskfwr4y36c4yq5gc7mwlyim4j6dpn70mg1"; type = "gem"; }; - version = "1.13.4"; + version = "1.13.5"; }; nori = { groups = ["default"]; @@ -1287,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lisy36pcyhqvhxkl55pgcyw67n9birzsyrgkm0b7sbkn4jpv0d0"; + sha256 = "0mn4zgp7jhkn352435xsi5rz3d532d34zw3jxjdg4q9wpymsw6nr"; type = "gem"; }; - version = "0.1.35"; + version = "0.1.38"; }; rex-sslscan = { groups = ["default"]; @@ -1387,10 +1387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v0dvys954c1d5azzz05p1jg57knk3d10b61wwfx00dw8pz76amw"; + sha256 = "1c0qdi787hvf3d8p3ivjlfwnj2cz70cgj656x26wnn0rhrgbad1n"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix index e1504eb12b4cc..9e9aeaa409d42 100644 --- a/pkgs/tools/security/ncrack/default.nix +++ b/pkgs/tools/security/ncrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib }: stdenv.mkDerivation rec { pname = "ncrack"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/nmap/ncrack/pull/83 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch"; + sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3"; + }) + ]; + buildInputs = [ openssl zlib ]; meta = with lib; { diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 60775be180c85..fdfab9bc1954b 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { defusedxml pyaml pykeepass - python_magic # similar API to "file-magic", but already in nixpkgs. + python-magic # similar API to "file-magic", but already in nixpkgs. secretstorage ]; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index adf514006b153..8f7498083cc20 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "Faster Nmap Scanning with Rust"; homepage = "https://github.com/RustScan/RustScan"; license = licenses.gpl3Only; - maintainers = [ maintainers.SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 4803430018ed3..50477cf92f0df 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -95,5 +95,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://sequoia-pgp.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson doronbehar ]; + mainProgram = "sq"; }; } diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index b650b93f411b7..5877910ad2c48 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "smallstep"; @@ -53,7 +53,6 @@ buildGoModule rec { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai mohe2015 ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ cmcdragonkai mohe2015 techknowlogick ]; }; } diff --git a/pkgs/tools/security/swaggerhole/default.nix b/pkgs/tools/security/swaggerhole/default.nix new file mode 100644 index 0000000000000..8455867b4be2f --- /dev/null +++ b/pkgs/tools/security/swaggerhole/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "swaggerhole"; + version = "1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Liodeus"; + repo = pname; + # Source is not tagged at the moment, https://github.com/Liodeus/swaggerHole/issues/2 + rev = "14846406fbd0f145d71ad51c3b87f383e4afbc3b"; + hash = "sha256-3HmIpn1A86PXZRL+SqMdr84O16hW1mCUWHKnOVolmx8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + whispers + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "swaggerhole" + ]; + + meta = with lib; { + description = "Tool to searching for secret on swaggerhub"; + homepage = "https://github.com/Liodeus/swaggerHole"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix new file mode 100644 index 0000000000000..4aa9e1852aeed --- /dev/null +++ b/pkgs/tools/security/trueseeing/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "trueseeing"; + version = "2.1.4"; + format = "flit"; + + src = fetchFromGitHub { + owner = "alterakey"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zc0AOv7OFmEPLl//eykbh538rM2j4kXBLHt5bgK1IRY="; + }; + + nativeBuildInputs = with python3.pkgs; [ + flit-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + ipython + jinja2 + lxml + pypubsub + pyyaml + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "trueseeing" + ]; + + meta = with lib; { + description = "Non-decompiling Android vulnerability scanner"; + homepage = "https://github.com/alterakey/trueseeing"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 048d06f200434..d1a26f2572490 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update-bin.sh; meta = with lib; { - homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + homepage = "https://www.vaultproject.io"; license = licenses.mpl20; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; + mainProgram = "vault"; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix new file mode 100644 index 0000000000000..390ed880ca1e2 --- /dev/null +++ b/pkgs/tools/security/yersinia/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fetchpatch +, ncurses, libpcap, libnet +# alpha version of GTK interface +, withGtk ? false, gtk2 +# enable remote admin interface +, enableAdmin ? false +}: + +stdenv.mkDerivation rec { + pname = "yersinia"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "tomac"; + repo = pname; + rev = "v${version}"; + sha256 = "06yfpf9iyi525rly1ychsihzvw3sas8kp0nxxr99xkwiqp5dc78b"; + }; + + patches = [ + # ncurses-6.3 support, included in next release + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch"; + sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libpcap libnet ncurses ] + ++ lib.optional withGtk gtk2; + + autoreconfPhase = "./autogen.sh"; + + configureFlags = [ + "--with-pcap-includes=${libpcap}/include" + "--with-libnet-includes=${libnet}/include" + ] + ++ lib.optional (!enableAdmin) "--disable-admin" + ++ lib.optional (!withGtk) "--disable-gtk"; + + makeFlags = [ "LDFLAGS=-lncurses" ]; + + meta = with lib; { + description = "A framework for layer 2 attacks"; + homepage = "https://github.com/tomac/yersinia"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vdot0x23 ]; + # INSTALL and FAQ in this package seem a little outdated + # so not sure, but it could work on openbsd, illumos, and freebsd + # if you have a machine to test with, feel free to add these + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 8d272b15acf1f..e957c10a85cf0 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--disable-werror" - ] ++ plugins.configureFlags; + ] ++ plugins.configureFlags + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ]; # do not create directories in /var during installPhase postConfigure = '' diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index ffa016cabfee8..c9e87bef62144 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ninja, libevdev, libev, udev }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ninja, libevdev, libev, udev }: stdenv.mkDerivation rec { pname = "illum"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "prevent-unplug-segfault"; # See https://github.com/jmesmon/illum/issues/19 + url = "https://github.com/jmesmon/illum/commit/47b7cd60ee892379e5d854f79db343a54ae5a3cc.patch"; + sha256 = "sha256-hIBBCIJXAt8wnZuyKye1RiEfOCelP3+4kcGrM43vFOE="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ninja libevdev libev udev ]; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 2ad0d11f95f01..6020f1658e6a7 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch"; sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY="; }) + # Pull upstream patch to support upstream gcc-10: + # https://github.com/ipmitool/ipmitool/pull/180 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/ipmitool/ipmitool/commit/51c7e0822f531469cf860dfa5d010c87b284b747.patch"; + sha256 = "sha256-5UszUdVw3s2S5RCm5Exq4mqDqiYcN62in1O5+TZu9YA="; + }) ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index 05d2d853b2480..4693763a89c62 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/nats-io/nkeys"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "nk"; }; } diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 073a0921f98e2..8408ed5e8d189 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,10 +1,8 @@ -{ lib, python2Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -let - version = "3.13"; +python3Packages.buildPythonApplication rec { pname = "ps_mem"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; + version = "3.13"; src = fetchFromGitHub { owner = "pixelb"; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 6948728f16b9a..990e7afc39a13 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkg-config, glib, python2, systemd, perl +, eventlog, pkg-config, glib, python3, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { eventlog glib perl - python2 + python3 systemd riemann_c_client protobufc diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/tools/system/taskspooler/default.nix index 9899a9fb3f641..2692595477813 100644 --- a/pkgs/tools/system/taskspooler/default.nix +++ b/pkgs/tools/system/taskspooler/default.nix @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple single node task scheduler"; - license = licenses.gpl2Plus; homepage = "https://vicerveza.homeunix.net/~viric/wsgi-bin/hgweb.wsgi/ts"; - platforms = platforms.unix; + license = licenses.gpl2Plus; maintainers = [ maintainers.sheepforce ]; + mainProgram = "ts"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/tools/text/bashblog/default.nix index 2649b5640441d..3c8d90caf8436 100644 --- a/pkgs/tools/text/bashblog/default.nix +++ b/pkgs/tools/text/bashblog/default.nix @@ -45,8 +45,12 @@ in stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin install -Dm755 bb.sh $out/bin/bashblog + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix new file mode 100644 index 0000000000000..cfbfee48938a0 --- /dev/null +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "cidrgrep"; + version = "unstable-2020-11-17"; + + src = fetchFromGitHub { + owner = "tomdoherty"; + repo = "cidrgrep"; + rev = "8ad5af533e8dc33ea18ff19b7c6a41550748fe0e"; + sha256 = "sha256:0jvwm9jq5jd270b6l9nkvc5pr3rgf158sw83lrprmwmz7r4mr786"; + }; + + vendorSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + postInstall = '' + mv $out/bin/cmd $out/bin/cidrgrep + ''; + + meta = { + description = "Like grep but for IPv4 CIDRs"; + maintainers = with lib.maintainers; [ das_j ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 40ee8c58fbcc7..b02d4fcd5fc92 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "codesearch"; - version = "1.0.0"; - - goPackagePath = "github.com/google/codesearch"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "codesearch"; rev = "v${version}"; - sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k="; + sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index dd03bcfa6a35d..44d50c0c9634d 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; + mainProgram = "markdown"; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index d5e7922831ea2..e15941b5fc8c6 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,11 +11,10 @@ , libxml2 , libgda6 , libhandy -, libsoup +, libsoup_3 , json-glib , gspell , glib -, libdazzle , gtk3 , gtksourceview4 , gnome @@ -25,22 +23,13 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "E28R/gOhlJkMQ6/jOL0eoK0U5+H26Gjlv3xbUsTF5eE="; + sha256 = "Kme8v+ZDBhsGltiaEIR9UL81kF/zNhuYcTV9PjQi8Ts="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:15:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch"; - sha256 = "aRg6dYweftV8F7FXykO7m0G+p4SLTFnhTcZx72UCMDE="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -55,11 +44,10 @@ stdenv.mkDerivation rec { libxml2 glib gtk3 - libdazzle gtksourceview4 libgda6 libhandy - libsoup + libsoup_3 json-glib gettext gspell diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 5ad14295e8728..fbff68abb692c 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; # let intermediate tools find intermediate library preBuild = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 058c2ba3daa54..62b83636b37c9 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { patches = [./malloc.patch]; meta = { - homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; + homepage = "https://replace.richardlloyd.org.uk/"; + mainProgram = "replace-literal"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index dc025f17a78b5..f282c28f8fe18 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "sift"; @@ -7,6 +7,8 @@ buildGoPackage rec { goPackagePath = "github.com/svent/sift"; + nativeBuildInputs = [ installShellFiles ]; + src = fetchFromGitHub { inherit rev; owner = "svent"; @@ -14,12 +16,16 @@ buildGoPackage rec { sha256 = "0bgy0jf84z1c3msvb60ffj4axayfchdkf0xjnsbx9kad1v10g7i1"; }; + postInstall = '' + installShellCompletion --cmd sift --bash go/src/github.com/svent/sift/sift-completion.bash + ''; + goDeps = ./deps.nix; meta = with lib; { description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; - maintainers = [ maintainers.carlsverre ]; + maintainers = with maintainers; [ carlsverre viraptor ]; license = licenses.gpl3; }; } diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f1ab390e481bd..741dcaad344e0 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.3"; + version = "8.4"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw="; + sha256 = "sha256-QbubFOH0zWEC4/jft55xRqJMCWk4aYcxZcQhdppX0Tc="; }; buildInputs = [curl libiconv]; diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/tools/virtualization/lxd-image-server/default.nix index 3a1d32247a40c..aeb6ac336932c 100644 --- a/pkgs/tools/virtualization/lxd-image-server/default.nix +++ b/pkgs/tools/virtualization/lxd-image-server/default.nix @@ -3,6 +3,7 @@ , rsync , python3 , fetchFromGitHub +, nixosTests }: python3.pkgs.buildPythonApplication rec { @@ -37,6 +38,8 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; + passthru.tests.lxd-image-server = nixosTests.lxd-image-server; + meta = with lib; { description = "Creates and manages a simplestreams lxd image server on top of nginx"; homepage = "https://github.com/Avature/lxd-image-server"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 665d2f4765c07..d0c8cee8e24ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 + awesome-4-0 = awesome; # Added 2022-05-05 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 @@ -146,6 +147,7 @@ mapAliases ({ c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 + caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 callPackage_i686 = pkgsi686Linux.callPackage; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e61db0e75b852..9f5fd509e3e6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ with pkgs; autoconf = autoconf269; }; - autorestic = callPackage ../tools/backup/autorestic { }; + autorestic = callPackage ../tools/backup/autorestic { + buildGoModule = buildGo118Module; + }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; @@ -440,6 +442,8 @@ with pkgs; enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + erosmb = callPackage ../tools/security/erosmb { }; + onesixtyone = callPackage ../tools/security/onesixtyone {}; oletools = with python3.pkgs; toPythonApplication oletools; @@ -602,7 +606,9 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; - perseus-cli = callPackage ../development/tools/perseus-cli { }; + perseus-cli = callPackage ../development/tools/perseus-cli { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; pet = callPackage ../development/tools/pet { }; @@ -1088,6 +1094,8 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; + airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { @@ -1113,6 +1121,8 @@ with pkgs; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; + cidrgrep = callPackage ../tools/text/cidrgrep { }; + cope = callPackage ../tools/misc/cope { }; ejson2env = callPackage ../tools/admin/ejson2env { }; @@ -1153,6 +1163,8 @@ with pkgs; headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; + headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; + httm = callPackage ../tools/filesystems/httm { }; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; @@ -1652,7 +1664,9 @@ with pkgs; amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; - amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { }; + amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { + inherit (darwin.apple_sdk.frameworks) Security; + }; amber = callPackage ../tools/text/amber { inherit (darwin.apple_sdk.frameworks) Security; @@ -3246,6 +3260,8 @@ with pkgs; dibbler = callPackage ../tools/networking/dibbler { }; + dieharder = callPackage ../tools/security/dieharder { }; + diesel-cli = callPackage ../development/tools/diesel-cli { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4709,6 +4725,8 @@ with pkgs; usbview = callPackage ../tools/misc/usbview { }; + usbimager = callPackage ../tools/misc/usbimager { }; + uwuify = callPackage ../tools/misc/uwuify { }; anthy = callPackage ../tools/inputmethods/anthy { }; @@ -5569,9 +5587,7 @@ with pkgs; elasticsearch = elasticsearch7; }; - elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { - python = python3; - }; + elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; @@ -5643,8 +5659,10 @@ with pkgs; }; exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isi686 then gcc6Stdenv else gcc9Stdenv; - boost = boost15x; + stdenv = if stdenv.isDarwin then stdenv + else if stdenv.isi686 then gcc6Stdenv + else gcc9Stdenv; + boost = if stdenv.isDarwin then boost else boost15x; }; execline = skawarePackages.execline; @@ -6406,8 +6424,6 @@ with pkgs; gnirehtet = callPackage ../tools/networking/gnirehtet { }; - gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; - gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-desktop = callPackage ../development/libraries/gnome-desktop { }; @@ -8053,9 +8069,6 @@ with pkgs; librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; inherit (callPackages ../development/libraries/libwebsockets { }) - libwebsockets_3_1 - libwebsockets_3_2 - libwebsockets_4_2 libwebsockets_4_3; libwebsockets = libwebsockets_4_3; @@ -9136,8 +9149,6 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - paperless-ngx = callPackage ../applications/office/paperless-ngx { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -9499,7 +9510,9 @@ with pkgs; proxify = callPackage ../tools/networking/proxify { }; - proxysql = callPackage ../servers/sql/proxysql { }; + proxysql = callPackage ../servers/sql/proxysql { + stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv; + }; prs = callPackage ../tools/security/prs { }; @@ -10241,7 +10254,9 @@ with pkgs; silc_server = callPackage ../servers/silc-server { }; - sile = callPackage ../tools/typesetting/sile { }; + sile = callPackage ../tools/typesetting/sile { + lua = lua5_4; + }; silver-searcher = callPackage ../tools/text/silver-searcher { }; @@ -10355,7 +10370,9 @@ with pkgs; jdk = jdk11; }; - spglib = callPackage ../development/libraries/spglib { }; + spglib = callPackage ../development/libraries/spglib { + inherit (llvmPackages) openmp; + }; spicy = callPackage ../development/tools/spicy { }; @@ -10610,6 +10627,8 @@ with pkgs; swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; + swaggerhole = callPackage ../tools/security/swaggerhole { }; + swapview = callPackage ../os-specific/linux/swapview { }; swtpm = callPackage ../tools/security/swtpm { }; @@ -11013,6 +11032,8 @@ with pkgs; trousers = callPackage ../tools/security/trousers { }; + trueseeing = callPackage ../tools/security/trueseeing { }; + trx = callPackage ../tools/audio/trx { }; tryton = callPackage ../applications/office/tryton { }; @@ -11689,8 +11710,6 @@ with pkgs; chase = callPackage ../tools/system/chase { }; - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; - wimlib = callPackage ../tools/archivers/wimlib { }; wipe = callPackage ../tools/security/wipe { }; @@ -12362,7 +12381,7 @@ with pkgs; comby = callPackage ../development/tools/comby { }; - compcert = coqPackages.compcert.override { version = "3.9"; }; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { @@ -14198,25 +14217,6 @@ with pkgs; nodejs = nodejs_latest; }; - lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; - - lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; - - lxpanel = callPackage ../desktops/lxde/core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxtask = callPackage ../desktops/lxde/core/lxtask { }; - - lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; - - lxsession = callPackage ../desktops/lxde/core/lxsession { }; - kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -15530,8 +15530,6 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); - gob2 = callPackage ../development/tools/misc/gob2 { }; gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; @@ -18594,6 +18592,7 @@ with pkgs; libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; + libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { }; libffiBoot = libffi.override { doCheck = false; }; @@ -21843,12 +21842,16 @@ with pkgs; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kanidm = callPackage ../servers/kanidm { }; + kapowbang = callPackage ../servers/kapowbang { }; keycloak = callPackage ../servers/keycloak { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + systemd = systemdMinimal; # in closure already anyway + }; rdkafka = callPackage ../development/libraries/rdkafka { }; @@ -22906,7 +22909,9 @@ with pkgs; drbd = callPackage ../os-specific/linux/drbd { }; - dropwatch = callPackage ../os-specific/linux/dropwatch { }; + dropwatch = callPackage ../os-specific/linux/dropwatch { + readline = readline81; + }; dsd = callPackage ../applications/radio/dsd { }; @@ -24369,6 +24374,8 @@ with pkgs; kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + khmeros = callPackage ../data/fonts/khmeros {}; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -24435,6 +24442,8 @@ with pkgs; linux-manual = callPackage ../data/documentation/linux-manual { }; + lklug-sinhala = callPackage ../data/fonts/lklug-sinhala {}; + lmmath = callPackage ../data/fonts/lmmath {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -24541,6 +24550,8 @@ with pkgs; nafees = callPackage ../data/fonts/nafees { }; + nanum = callPackage ../data/fonts/nanum { }; + nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; national-park-typeface = callPackage ../data/fonts/national-park { }; @@ -24738,6 +24749,8 @@ with pkgs; sierra-gtk-theme = callPackage ../data/themes/sierra { }; + sil-padauk = callPackage ../data/fonts/sil-padauk { }; + snap7 = callPackage ../development/libraries/snap7 {}; snowblind = callPackage ../data/themes/snowblind { }; @@ -24837,6 +24850,8 @@ with pkgs; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; + takao = callPackage ../data/fonts/takao { }; + taskspooler = callPackage ../tools/system/taskspooler { }; tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; @@ -24880,6 +24895,8 @@ with pkgs; theme-vertex = callPackage ../data/themes/vertex { }; + tibetan-machine = callPackage ../data/fonts/tibetan-machine { }; + times-newer-roman = callPackage ../data/fonts/times-newer-roman { }; tipa = callPackage ../data/fonts/tipa { }; @@ -25256,11 +25273,10 @@ with pkgs; avrdudess = callPackage ../applications/misc/avrdudess { }; - awesome-4-0 = callPackage ../applications/window-managers/awesome { + awesome = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; }; - awesome = awesome-4-0; awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; @@ -27831,8 +27847,6 @@ with pkgs; inherit (luajitPackages) luafilesystem; }; - lookatme = callPackage ../tools/misc/lookatme {}; - looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; ltc-tools = callPackage ../applications/audio/ltc-tools { }; @@ -28374,8 +28388,7 @@ with pkgs; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; - # Broken with Qt5.15 because qtwebkit is broken with it - p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; + p4v = libsForQt515.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -29020,7 +29033,8 @@ with pkgs; protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; - protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; @@ -29277,6 +29291,8 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; + remnote = callPackage ../applications/misc/remnote { }; + remotebox = callPackage ../applications/virtualization/remotebox { }; restique = libsForQt5.callPackage ../applications/backup/restique { }; @@ -29707,8 +29723,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; - surf-display = callPackage ../desktops/surf-display { }; - surge = callPackage ../applications/audio/surge { inherit (gnome) zenity; git = gitMinimal; @@ -30392,7 +30406,7 @@ with pkgs; wafw00f = callPackage ../tools/security/wafw00f { }; - whispers = callPackage ../tools/security/whispers { }; + whispers = with python3Packages; toPythonApplication whispers; waon = callPackage ../applications/audio/waon { }; @@ -32442,12 +32456,19 @@ with pkgs; wyvern = callPackage ../games/wyvern { }; + hsetroot = callPackage ../tools/X11/hsetroot { }; + + imwheel = callPackage ../tools/X11/imwheel { }; + + kakasi = callPackage ../tools/text/kakasi { }; + ### DESKTOP ENVIRONMENTS + arcan = recurseIntoAttrs (callPackage ../desktops/arcan { }); + cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { @@ -32472,14 +32493,28 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - hsetroot = callPackage ../tools/X11/hsetroot { }; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { }; - imwheel = callPackage ../tools/X11/imwheel { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; - kakasi = callPackage ../tools/text/kakasi { }; + gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); + ### DESKTOPS/LXDE + + lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); + # Backwards compatibility aliases + inherit (lxde) + lxappearance + lxappearance-gtk2 + lxmenu-data + lxpanel + lxrandr + lxsession + lxtask + ; + lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs; inherit (lib) makeScope; @@ -32490,6 +32525,18 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); + pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; + + wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; + + rox-filer = callPackage ../desktops/rox/rox-filer { + gtk = gtk2; + }; + + surf-display = callPackage ../desktops/surf-display { }; + + xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); + plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; @@ -32508,16 +32555,6 @@ with pkgs; gnome-themes-extra = gnome.gnome-themes-extra; - rox-filer = callPackage ../desktops/rox/rox-filer { - gtk = gtk2; - }; - - arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope arcan; - }); - - xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -33419,13 +33456,6 @@ with pkgs; caffeWithCuda = caffe.override { cudaSupport = true; }; - caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { - inherit (python3Packages) python future six numpy pydot; - protobuf = protobuf3_1; - python-protobuf = python3Packages.protobuf.override { inherit protobuf; }; - opencv3 = opencv3WithoutCuda; # Used only for image loading. - }); - caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; cntk = callPackage ../applications/science/math/cntk { @@ -33989,6 +34019,8 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; + kompute = callPackage ../development/libraries/kompute { }; + kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; # In general we only want keep the last three minor versions around that @@ -34950,6 +34982,8 @@ with pkgs; yarGen = callPackage ../tools/security/yarGen { }; + yersinia = callPackage ../tools/security/yersinia { }; + yaxg = callPackage ../tools/graphics/yaxg {}; zap = callPackage ../tools/networking/zap { }; @@ -35057,7 +35091,7 @@ with pkgs; simplenote = callPackage ../applications/misc/simplenote { }; - hy = callPackage ../development/interpreters/hy {}; + hy = python3Packages.hy.withPackages (python-packages: [ ]); wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; @@ -35071,8 +35105,6 @@ with pkgs; chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; - chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; NSPlist = callPackage ../development/libraries/NSPlist {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6af05d761c438..9c3e666c5b3bc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -160,7 +160,7 @@ in rec { coqPackages_8_13 = mkCoqPackages coq_8_13; coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; - coqPackages = recurseIntoAttrs coqPackages_8_13; + coqPackages = recurseIntoAttrs coqPackages_8_15; coq = coqPackages.coq; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9743acce4b6d8..454e1cdca76b8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -541,6 +541,7 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); + linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e8ac6445d0ebf..3e0e8e25b2fac 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -105,13 +105,13 @@ in vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { pname = "vicious"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { - owner = "Mic92"; + owner = "vicious-widgets"; repo = "vicious"; rev = "v${version}"; - sha256 = "0lb90334mz0my8ydsmnsnkki0xr58kinsg0hf9d6k4b0vjfi0r0a"; + sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; }; buildInputs = [ lua ]; @@ -124,9 +124,9 @@ in meta = with lib; { description = "A modular widget library for the awesome window manager"; - homepage = "https://github.com/Mic92/vicious"; - license = licenses.gpl2; - maintainers = with maintainers; [ makefu mic92 ]; + homepage = "https://vicious.rtfd.io"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ makefu mic92 McSinyx ]; platforms = platforms.linux; }; }); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72568265a8203..adf03ae727179 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18989,6 +18989,20 @@ let }; }; + POSIXAtFork = buildPerlPackage { + pname = "POSIX-AtFork"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors//id/N/NI/NIKOLAS/POSIX-AtFork-0.04.tar.gz"; + sha256 = "sha256-wuIpOobUhxRLyPe6COfEt2sRsOTf3EGAmEXTDvoH5g4="; + }; + buildInputs = [ TestSharedFork ]; + meta = { + description = "Hook registrations at fork(2)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + POSIXstrftimeCompiler = buildPerlModule { pname = "POSIX-strftime-Compiler"; version = "0.44"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dcb33f79658a..385bf1142b396 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 + python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 032349a2d49ff..638c770ae950d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -344,6 +344,8 @@ in { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolimiter = callPackage ../development/python-modules/aiolimiter { }; + aiolip = callPackage ../development/python-modules/aiolip { }; aiolyric = callPackage ../development/python-modules/aiolyric { }; @@ -1386,6 +1388,8 @@ in { browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + brunt = callPackage ../development/python-modules/brunt { }; + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; @@ -2395,6 +2399,8 @@ in { django-taggit = callPackage ../development/python-modules/django-taggit { }; + django-tastypie = callPackage ../development/python-modules/django-tastypie { }; + django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; @@ -3268,6 +3274,8 @@ in { gbulb = callPackage ../development/python-modules/gbulb { }; + gcal-sync = callPackage ../development/python-modules/gcal-sync { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; @@ -3786,6 +3794,8 @@ in { hatchling = callPackage ../development/python-modules/hatchling { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; @@ -3996,6 +4006,8 @@ in { hyppo = callPackage ../development/python-modules/hyppo { }; + hyrule = callPackage ../development/python-modules/hyrule { }; + i2c-tools = callPackage ../development/python-modules/i2c-tools { inherit (pkgs) i2c-tools; }; @@ -4148,6 +4160,8 @@ in { installer = callPackage ../development/python-modules/installer { }; + insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; @@ -5163,6 +5177,8 @@ in { measurement = callPackage ../development/python-modules/measurement { }; + meater-python = callPackage ../development/python-modules/meater-python { }; + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { }; @@ -5732,6 +5748,8 @@ in { notifications-python-client = callPackage ../development/python-modules/notifications-python-client { }; + notify-events = callPackage ../development/python-modules/notify-events { }; + notify-py = callPackage ../development/python-modules/notify-py { }; notify2 = callPackage ../development/python-modules/notify2 { }; @@ -6355,6 +6373,8 @@ in { proxy_tools = callPackage ../development/python-modules/proxy_tools { }; + py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; + pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { }; pyatag = callPackage ../development/python-modules/pyatag { }; @@ -7695,6 +7715,8 @@ in { py-radix = callPackage ../development/python-modules/py-radix { }; + pyrainbird = callPackage ../development/python-modules/pyrainbird { }; + pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; pyramid = callPackage ../development/python-modules/pyramid { }; @@ -8344,7 +8366,7 @@ in { inherit (pkgs) lzo; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + python-magic = callPackage ../development/python-modules/python-magic { }; python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; @@ -8752,6 +8774,8 @@ in { qnap-qsw = callPackage ../development/python-modules/qnap-qsw{ }; + qnapstats = callPackage ../development/python-modules/qnapstats { }; + qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -8764,6 +8788,8 @@ in { qscintilla = self.qscintilla-qt5; + qstylizer = callPackage ../development/python-modules/qstylizer { }; + qt5reactor = callPackage ../development/python-modules/qt5reactor { }; qtawesome = callPackage ../development/python-modules/qtawesome { }; @@ -8815,6 +8841,8 @@ in { rainbowstream = callPackage ../development/python-modules/rainbowstream { }; + raincloudy = callPackage ../development/python-modules/raincloudy { }; + ramlfications = callPackage ../development/python-modules/ramlfications { }; random2 = callPackage ../development/python-modules/random2 { }; @@ -9269,6 +9297,8 @@ in { scs = callPackage ../development/python-modules/scs { }; + sdds = callPackage ../development/python-modules/sdds { }; + sdnotify = callPackage ../development/python-modules/sdnotify { }; seaborn = callPackage ../development/python-modules/seaborn { }; @@ -9484,7 +9514,9 @@ in { skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; - skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; + skytemple-rust = callPackage ../development/python-modules/skytemple-rust { + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation; + }; skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; @@ -10375,6 +10407,8 @@ in { ttp = callPackage ../development/python-modules/ttp { }; + ttp-templates = callPackage ../development/python-modules/ttp-templates { }; + tubes = callPackage ../development/python-modules/tubes { }; tunigo = callPackage ../development/python-modules/tunigo { }; @@ -10915,6 +10949,8 @@ in { whisper = callPackage ../development/python-modules/whisper { }; + whispers = callPackage ../development/python-modules/whispers { }; + whitenoise = callPackage ../development/python-modules/whitenoise { }; whodap = callPackage ../development/python-modules/whodap { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 88b53f6b636a8..a1e72c90bea45 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -317,6 +317,7 @@ let random QuickCheck cabal2nix + xhtml # isn't bundled for cross ; }; @@ -327,6 +328,7 @@ let random QuickCheck cabal2nix + xhtml # isn't bundled for cross ; }; }; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index ceae00baec9c1..e066d191ef2bf 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -103,7 +103,7 @@ rec { forAllSystems = genAttrs supportedSystems; - # Generate attributes for all sytems matching at least one of the given + # Generate attributes for all systems matching at least one of the given # patterns forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns); |