diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 340a24cac087..c68e50f10578 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1234,6 +1234,12 @@ githubId = 37040543; name = "Wroclaw"; }; + amuckstot30 = { + email = "amuckstot30@tutanota.com"; + github = "amuckstot30"; + githubId = 157274630; + name = "amuckstot30"; + }; amyipdev = { email = "amy@amyip.net"; github = "amyipdev"; @@ -2938,6 +2944,14 @@ githubId = 3229981; name = "Duncan Fairbanks"; }; + BonusPlay = { + name = "Bonus"; + email = "nixos@bonusplay.pl"; + matrix = "@bonus:bonusplay.pl"; + github = "BonusPlay"; + githubId = 8405359; + keys = [ { fingerprint = "8279 6487 A4CA 2A28 E8B3 3CD6 C7F9 9743 6A20 4683"; } ]; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -5597,6 +5611,12 @@ name = "Misha Gusarov"; keys = [ { fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; } ]; }; + dottybot = { + name = "Scala Organization (dottybot)"; + email = "dottybot@groupes.epfl.ch"; + github = "dottybot"; + githubId = 12519979; + }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; @@ -8237,6 +8257,12 @@ githubId = 1742172; name = "Hamish Hutchings"; }; + hamzaremmal = { + email = "hamza.remmal@epfl.ch"; + github = "hamzaremmal"; + githubId = 56235032; + name = "Hamza Remmal"; + }; hanemile = { email = "mail@emile.space"; github = "HanEmile"; @@ -14759,6 +14785,13 @@ githubId = 818502; name = "Nathan Yong"; }; + natsukagami = { + email = "natsukagami@gmail.com"; + github = "natsukagami"; + githubId = 9061737; + name = "Natsu Kagami"; + keys = [ { fingerprint = "5581 26DC 886F E14D 501D B0F2 D6AD 7B57 A992 460C"; } ]; + }; natsukium = { email = "nixpkgs@natsukium.com"; github = "natsukium"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1d0c8e509738..a992008a4e1b 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -73,6 +73,8 @@ - [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable). +- [Privatebin](https://github.com/PrivateBin/PrivateBin/), A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable) + - [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable). - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI @@ -331,6 +333,15 @@ a static `user` and `group`. The `writablePaths` option has been removed and the models directory is now always exempt from sandboxing. +- The `gns3-server` service now runs under the `gns3` system user + instead of a dynamically created one via `DynamicUser`. + The use of SUID wrappers is incompatible with SystemD's `DynamicUser` setting, + and GNS3 requires calling ubridge through its SUID wrapper to function properly. + This change requires to manually move the following directories: + * from `/var/lib/private/gns3` to `/var/lib/gns3` + * from `/var/log/private/gns3` to `/var/log/gns3` + and to change the ownership of these directories and their contents to `gns3` (including `/etc/gns3`). + - Legacy package `stalwart-mail_0_6` was dropped, please note the [manual upgrade process](https://github.com/stalwartlabs/mail-server/blob/main/UPGRADING.md) before changing the package to `pkgs.stalwart-mail` in diff --git a/nixos/modules/config/nix-flakes.nix b/nixos/modules/config/nix-flakes.nix index d6c31735a6ca..90e207fd4a61 100644 --- a/nixos/modules/config/nix-flakes.nix +++ b/nixos/modules/config/nix-flakes.nix @@ -72,7 +72,7 @@ in type = "path"; path = config.flake.outPath; } // filterAttrs - (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + (n: _: n == "lastModified" || n == "rev" || n == "narHash") config.flake )); }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dabeebb34e1e..bf9b3db4b967 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1489,6 +1489,7 @@ ./services/web-apps/powerdns-admin.nix ./services/web-apps/pretalx.nix ./services/web-apps/pretix.nix + ./services/web-apps/privatebin.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/rimgo.nix ./services/web-apps/rutorrent.nix diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index bf8414e1e108..b65c698d62a1 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -196,14 +196,8 @@ in # To prevent gratuitous rebuilds on each change to Nixpkgs nixos.revision = null; - stateVersion = lib.mkDefault (throw '' - The macOS linux builder should not need a stateVersion to be set, but a module - has accessed stateVersion nonetheless. - Please inspect the trace of the following command to figure out which module - has a dependency on stateVersion. - - nix-instantiate --attr darwin.linux-builder --show-trace - ''); + # to be updated by module maintainers, see nixpkgs#325610 + stateVersion = "24.05"; }; users.users."${user}" = { diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index a010bb6c6d57..1795db5c2470 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -22,7 +22,7 @@ let serverOptions = { name, config, ... }: { freeformType = attrsOf (either scalarType (listOf scalarType)); # Client system-options file directives are explained here: - # https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=commands-processing-options + # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options options.servername = mkOption { type = servernameType; default = name; diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix index 3cc0176f3db3..11a6af588b5b 100644 --- a/nixos/modules/security/isolate.nix +++ b/nixos/modules/security/isolate.nix @@ -125,7 +125,7 @@ in }; systemd.slices.isolate = { - description = "Isolate sandbox slice"; + description = "Isolate Sandbox Slice"; }; meta.maintainers = with maintainers; [ virchau13 ]; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index f7a86915d5bc..0851b5b0bf14 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -657,7 +657,7 @@ in { config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) { systemd.slices.system-bacula = { - description = "Bacula Slice"; + description = "Bacula Backup System Slice"; documentation = [ "man:bacula(8)" "https://www.bacula.org/" ]; }; diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix index 9e1abb85bfe5..6589fcd9466c 100644 --- a/nixos/modules/services/backup/tsm.nix +++ b/nixos/modules/services/backup/tsm.nix @@ -90,7 +90,7 @@ in environment.HOME = "/var/lib/tsm-backup"; serviceConfig = { # for exit status description see - # https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=clients-client-return-codes + # https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes SuccessExitStatus = "4 8"; # The `-se` option must come after the command. # The `-optfile` option suppresses a `dsm.opt`-not-found warning. diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index a8a8973f25ba..189aaf86dd2d 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -311,7 +311,7 @@ in ]; systemd.slices.system-hydra = { - description = "Hydra Slice"; + description = "Hydra CI Server Slice"; documentation = [ "file://${cfg.package}/share/doc/hydra/index.html" "https://nixos.org/hydra/manual/" ]; }; diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix index 235d234609c0..ddd4699fea2a 100644 --- a/nixos/modules/services/development/athens.nix +++ b/nixos/modules/services/development/athens.nix @@ -168,7 +168,7 @@ in type = lib.types.package; default = pkgs.go; defaultText = lib.literalExpression "pkgs.go"; - example = "pkgs.go_1_21"; + example = "pkgs.go_1_23"; description = '' The Go package used by Athens at runtime. diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index e45dded3683d..73f09d804f29 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -234,7 +234,7 @@ in services.redis.servers.paperless.enable = mkIf enableRedis true; systemd.slices.system-paperless = { - description = "Paperless slice"; + description = "Paperless Document Management System Slice"; documentation = [ "https://docs.paperless-ngx.com" ]; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 026e4eae6d70..549228a4dae4 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -74,6 +74,12 @@ in description = "Group under which Redmine is ran."; }; + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address Redmine should bind to."; + }; + port = mkOption { type = types.port; default = 3000; @@ -429,7 +435,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart="${bundle} exec rails server -u webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + ExecStart="${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; }; }; diff --git a/nixos/modules/services/monitoring/rustdesk-server.nix b/nixos/modules/services/monitoring/rustdesk-server.nix index ea4dd43cbb35..e757d8fdf054 100644 --- a/nixos/modules/services/monitoring/rustdesk-server.nix +++ b/nixos/modules/services/monitoring/rustdesk-server.nix @@ -86,7 +86,7 @@ in { systemd.slices.system-rustdesk = { enable = true; - description = "Slice designed to contain RustDesk Signal & RustDesk Relay"; + description = "RustDesk Remote Desktop Slice"; }; systemd.targets.rustdesk = { diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 8df25e6373ca..e661d3ff33bf 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -179,7 +179,7 @@ in systemd = { slices.system-samba = { - description = "Samba slice"; + description = "Samba (SMB Networking Protocol) Slice"; }; targets.samba = { description = "Samba Server"; diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix index ec6a53dddc70..71980f52df2d 100644 --- a/nixos/modules/services/networking/gns3-server.nix +++ b/nixos/modules/services/networking/gns3-server.nix @@ -129,8 +129,15 @@ in { } ]; + users.groups.gns3 = { }; + users.groups.ubridge = lib.mkIf cfg.ubridge.enable { }; + users.users.gns3 = { + group = "gns3"; + isSystemUser = true; + }; + security.wrappers.ubridge = lib.mkIf cfg.ubridge.enable { capabilities = "cap_net_raw,cap_net_admin=eip"; group = "ubridge"; @@ -150,7 +157,7 @@ in { }; } (lib.mkIf (cfg.ubridge.enable) { - Server.ubridge_path = lib.mkDefault (lib.getExe cfg.ubridge.package); + Server.ubridge_path = lib.mkDefault "/run/wrappers/bin/ubridge"; }) (lib.mkIf (cfg.auth.enable) { Server = { @@ -206,7 +213,6 @@ in { serviceConfig = { ConfigurationDirectory = "gns3"; ConfigurationDirectoryMode = "0750"; - DynamicUser = true; Environment = "HOME=%S/gns3"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStart = "${lib.getExe cfg.package} ${commandArgs}"; @@ -227,14 +233,27 @@ in { User = "gns3"; WorkingDirectory = "%S/gns3"; + # Required for ubridge integration to work + # + # GNS3 needs to run SUID binaries (ubridge) + # but NoNewPrivileges breaks execution of SUID binaries + DynamicUser = false; + NoNewPrivileges = false; + RestrictSUIDSGID = false; + PrivateUsers = false; + # Hardening - DeviceAllow = lib.optional flags.enableLibvirtd "/dev/kvm"; + DeviceAllow = [ + # ubridge needs access to tun/tap devices + "/dev/net/tap rw" + "/dev/net/tun rw" + ] ++ lib.optionals flags.enableLibvirtd [ + "/dev/kvm" + ]; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; - NoNewPrivileges = true; PrivateTmp = true; - PrivateUsers = true; # Don't restrict ProcSubset because python3Packages.psutil requires read access to /proc/stat # ProcSubset = "pid"; ProtectClock = true; @@ -255,8 +274,7 @@ in { ]; RestrictNamespaces = true; RestrictRealtime = true; - RestrictSUIDSGID = true; - UMask = "0077"; + UMask = "0022"; }; }; }; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 90b69df2d4a3..2b0929599723 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -165,7 +165,7 @@ in environment.etc."clamav/clamd.conf".source = clamdConfigFile; systemd.slices.system-clamav = { - description = "ClamAV slice"; + description = "ClamAV Antivirus Slice"; }; systemd.services.clamav-daemon = mkIf cfg.daemon.enable { diff --git a/nixos/modules/services/web-apps/openwebrx.nix b/nixos/modules/services/web-apps/openwebrx.nix index 614eb963b4a3..2ac187dc88c9 100644 --- a/nixos/modules/services/web-apps/openwebrx.nix +++ b/nixos/modules/services/web-apps/openwebrx.nix @@ -18,7 +18,7 @@ in codec2 js8call m17-cxx-demod - alsaUtils + alsa-utils netcat ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/privatebin.nix b/nixos/modules/services/web-apps/privatebin.nix new file mode 100644 index 000000000000..6f6f9c27e389 --- /dev/null +++ b/nixos/modules/services/web-apps/privatebin.nix @@ -0,0 +1,228 @@ +{ + pkgs, + config, + lib, + ... +}: + +let + cfg = config.services.privatebin; + + customToINI = lib.generators.toINI { + mkKeyValue = lib.generators.mkKeyValueDefault { + mkValueString = + v: + if v == true then + ''true'' + else if v == false then + ''false'' + else if builtins.isInt v then + ''${builtins.toString v}'' + else if builtins.isPath v then + ''"${builtins.toString v}"'' + else if builtins.isString v then + ''"${v}"'' + else + lib.generators.mkValueStringDefault { } v; + } "="; + }; + + privatebinSettings = pkgs.writeTextDir "conf.php" (customToINI cfg.settings); + + user = cfg.user; + group = cfg.group; + + defaultUser = "privatebin"; + defaultGroup = "privatebin"; + +in +{ + + options.services.privatebin = { + + enable = lib.mkEnableOption "Privatebin: A minimalist, open source online + pastebin where the server has zero knowledge of pasted data."; + + user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = "User account under which privatebin runs."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = if cfg.enableNginx then "nginx" else defaultGroup; + defaultText = "If `services.privatebin.enableNginx` is true then `nginx` else ${defaultGroup}"; + description = '' + Group under which privatebin runs. It is best to set this to the group + of whatever webserver is being used as the frontend. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/privatebin"; + description = '' + The place where privatebin stores its state. + ''; + }; + + package = lib.mkPackageOption pkgs "privatebin" { }; + + enableNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable nginx or not. If enabled, an nginx virtual host will + be created for access to firefly-iii. If not enabled, then you may use + `''${config.services.firefly-iii.package}` as your document root in + whichever webserver you wish to setup. + ''; + }; + + virtualHost = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + The hostname at which you wish privatebin to be served. If you have + enabled nginx using `services.privatebin.enableNginx` then this will + be used. + ''; + }; + + poolConfig = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + lib.types.bool + ] + ); + defaultText = lib.literalExpression '' + { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + } + ''; + default = { }; + description = '' + Options for the PrivateBin PHP pool. See the documentation on php-fpm.conf + for details on configuration directives. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for privatebin configuration. Refer to + for + details on supported values. + ''; + example = lib.literalExpression '' + { + main = { + name = "NixOS Based Privatebin"; + discussion = false; + defaultformatter = "plalib.types.intext"; + qrcode = true + }; + model.class = "Filesystem"; + model_options.dir = "/var/lib/privatebin/data"; + } + ''; + type = lib.types.submodule { freeformType = lib.types.attrsOf lib.types.anything; }; + }; + }; + + config = lib.mkIf cfg.enable { + + services.privatebin.settings = { + main = lib.mkDefault { }; + model.class = lib.mkDefault "Filesystem"; + model_options.dir = lib.mkDefault "${cfg.dataDir}/data"; + purge.dir = lib.mkDefault "${cfg.dataDir}/purge"; + traffic = { + dir = lib.mkDefault "${cfg.dataDir}/traffic"; + header = "X_FORWARDED_FOR"; + }; + }; + + services.phpfpm.pools.privatebin = { + inherit user group; + phpPackage = pkgs.php83; + phpOptions = '' + log_errors = on + ''; + settings = { + "listen.mode" = lib.mkDefault "0660"; + "listen.owner" = lib.mkDefault user; + "listen.group" = lib.mkDefault group; + "pm" = lib.mkDefault "dynamic"; + "pm.max_children" = lib.mkDefault 32; + "pm.start_servers" = lib.mkDefault 2; + "pm.min_spare_servers" = lib.mkDefault 2; + "pm.max_spare_servers" = lib.mkDefault 4; + "pm.max_requests" = lib.mkDefault 500; + }; + phpEnv.CONFIG_PATH = lib.strings.removeSuffix "/conf.php" (builtins.toString privatebinSettings); + }; + + services.nginx = lib.mkIf cfg.enableNginx { + enable = true; + recommendedTlsSettings = lib.mkDefault true; + recommendedOptimisation = lib.mkDefault true; + recommendedGzipSettings = lib.mkDefault true; + virtualHosts.${cfg.virtualHost} = { + root = "${cfg.package}"; + locations = { + "/" = { + tryFiles = "$uri $uri/ /index.php?$query_string"; + index = "index.php"; + extraConfig = '' + sendfile off; + ''; + }; + "~ \.php$" = { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params ; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice + fastcgi_pass unix:${config.services.phpfpm.pools.privatebin.socket}; + ''; + }; + }; + }; + }; + + systemd.tmpfiles.settings."10-privatebin" = + lib.attrsets.genAttrs + [ + "${cfg.dataDir}/data" + "${cfg.dataDir}/traffic" + "${cfg.dataDir}/purge" + ] + (n: { + d = { + group = group; + mode = "0750"; + user = user; + }; + }); + + users = { + users = lib.mkIf (user == defaultUser) { + ${defaultUser} = { + description = "Privatebin service user"; + inherit group; + isSystemUser = true; + home = cfg.dataDir; + }; + }; + groups = lib.mkIf (group == defaultGroup) { ${defaultGroup} = { }; }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 183e25cde15e..2312fab2702b 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -240,7 +240,7 @@ in { }; systemd.slices.system-phpfpm = { - description = "PHP FastCGI Process manager pools slice"; + description = "PHP FastCGI Process Manager Slice"; }; systemd.targets.phpfpm = { diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index cd5c9e1c948f..7f824680b92e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -192,10 +192,7 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-xapp - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; services.orca.enable = mkDefault (notExcluded pkgs.orca); diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 70149bcf4ae0..4829990acc4f 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -74,9 +74,7 @@ in xdg.icons.enable = true; xdg.portal.enable = mkDefault true; xdg.portal.extraPortals = mkDefault [ - (pkgs.xdg-desktop-portal-gtk.override { - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bb2ce03e73a3..372300f34950 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -281,10 +281,7 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gnome - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ]; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index bbf2d337aac6..83c0dc27885e 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -447,7 +447,7 @@ let (let deps = deviceDependency v.interface; in - { description = "Vlan Interface ${n}"; + { description = "MACVLAN Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; partOf = [ "network-setup.service" ]; @@ -567,7 +567,7 @@ let (let deps = deviceDependency v.interface; in - { description = "Vlan Interface ${n}"; + { description = "VLAN Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; partOf = [ "network-setup.service" ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index d3d3240a446b..812d22d773e1 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -109,13 +109,15 @@ let cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" + declare -a extraFlags + if [ "$PRIVATE_NETWORK" = 1 ]; then - extraFlags+=" --private-network" + extraFlags+=("--private-network") fi if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then - extraFlags+=" --network-veth" + extraFlags+=("--network-veth") fi if [ -n "$HOST_PORT" ]; then @@ -123,30 +125,30 @@ let IFS="," for i in $HOST_PORT do - extraFlags+=" --port=$i" + extraFlags+=("--port=$i") done IFS=$OIFS fi if [ -n "$HOST_BRIDGE" ]; then - extraFlags+=" --network-bridge=$HOST_BRIDGE" + extraFlags+=("--network-bridge=$HOST_BRIDGE") fi - extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" + extraFlags+=(${lib.escapeShellArgs (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}) for iface in $INTERFACES; do - extraFlags+=" --network-interface=$iface" + extraFlags+=("--network-interface=$iface") done for iface in $MACVLANS; do - extraFlags+=" --network-macvlan=$iface" + extraFlags+=("--network-macvlan=$iface") done # If the host is 64-bit and the container is 32-bit, add a # --personality flag. ${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") '' if [ "$(< "''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system")" = i686-linux ]; then - extraFlags+=" --personality=x86" + extraFlags+=("--personality=x86") fi ''} @@ -157,9 +159,11 @@ let # Kill signal handling means systemd-nspawn will pass a system-halt signal # to the container systemd when it receives SIGTERM for container shutdown; # containerInit and stage2 have to handle this as well. + # TODO: fix shellcheck issue properly + # shellcheck disable=SC2086 exec ${config.systemd.package}/bin/systemd-nspawn \ --keep-unit \ - -M "$INSTANCE" -D "$root" $extraFlags \ + -M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \ $EXTRA_NSPAWN_FLAGS \ --notify-ready=yes \ --kill-signal=SIGRTMIN+3 \ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7bab420e874d..0e2a21803c2e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -825,6 +825,7 @@ in { printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; private-gpt = handleTest ./private-gpt.nix {}; + privatebin = runTest ./privatebin.nix; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix index 15ed5aa7f573..3e79fa11dc04 100644 --- a/nixos/tests/apfs.nix +++ b/nixos/tests/apfs.nix @@ -18,6 +18,10 @@ with subtest("mkapfs works with the maximum label length"): machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb") + with subtest("apfs-label works"): + machine.succeed("mkapfs -L 'myLabel' /dev/vdb") + machine.succeed("apfs-label /dev/vdb | grep -q myLabel") + with subtest("Enable case sensitivity and normalization sensitivity"): machine.succeed( "mkapfs -s -z /dev/vdb", diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index dacf4e576c07..5b63e2ba73eb 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -26,5 +26,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'") master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'") + master.succeed("sudo -u postgres psql -c 'select postgis_version();'") + master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${ + pkgs.lib.versions.major pkgs.postgis.version + }.${ + pkgs.lib.versions.minor pkgs.postgis.version + } USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]") + # st_makepoint goes through c code + master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'") ''; }) diff --git a/nixos/tests/privatebin.nix b/nixos/tests/privatebin.nix new file mode 100644 index 000000000000..c920b6220084 --- /dev/null +++ b/nixos/tests/privatebin.nix @@ -0,0 +1,21 @@ +{ lib, ... }: + +{ + name = "privatebin"; + meta.maintainers = [ lib.maintainers.savyajha ]; + + nodes.dataImporter = + { ... }: + { + services.privatebin = { + enable = true; + enableNginx = true; + }; + }; + + testScript = '' + dataImporter.wait_for_unit("phpfpm-privatebin.service") + dataImporter.wait_for_unit("nginx.service") + dataImporter.succeed("curl -fvvv -Ls http://localhost/ | grep 'PrivateBin'") + ''; +} diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index ad40bbef75c9..7e9981cc39ec 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -62,6 +62,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Alternative Free Identity System"; homepage = "https://alfis.name"; + changelog = "https://github.com/Revertron/Alfis/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ misuzu ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/blockchains/aperture/default.nix b/pkgs/applications/blockchains/aperture/default.nix index 90591889df5d..043b0311cca8 100644 --- a/pkgs/applications/blockchains/aperture/default.nix +++ b/pkgs/applications/blockchains/aperture/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "L402 (Lightning HTTP 402) Reverse Proxy"; homepage = "https://github.com/lightninglabs/aperture"; + changelog = "https://github.com/lightninglabs/aperture/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sputn1ck HannahMR ]; mainProgram = "aperture"; diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix index a2e2e9efbffb..f652f74be27f 100644 --- a/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -35,6 +35,7 @@ buildGoModule { meta = with lib; { homepage = "https://github.com/AthanorLabs/atomic-swap"; + changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${version}"; description = "ETH-XMR atomic swap implementation"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ happysalada lord-valen ]; diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 3c48f930a625..4c61c75a4f07 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Enterprise-grade Java-based, Apache 2.0 licensed Ethereum client"; homepage = "https://www.hyperledger.org/projects/besu"; + changelog = "https://github.com/hyperledger/besu/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 097acda8e8e9..e7e5f0f5a2c4 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Decentralized bitcoin exchange network"; homepage = "https://bisq.network"; + changelog = "https://github.com/bisq-network/bisq/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ juaningan emmanuelrosa ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 75c782a7f45e..8ae8a998b76c 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -79,6 +79,7 @@ mkDerivation rec { Bitcoin ABC is a fork of the Bitcoin Core software project. ''; homepage = "https://bitcoinabc.org/"; + changelog = "https://www.bitcoinabc.org/doc/release-notes/release-notes-${version}.html"; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 5c41ba65a695..e0db12dc167c 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; + changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md"; maintainers = with maintainers; [ prusnak mmahut ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/applications/blockchains/btcd/default.nix index 75b14613b8ae..aeda8019c10d 100644 --- a/pkgs/applications/blockchains/btcd/default.nix +++ b/pkgs/applications/blockchains/btcd/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Alternative full node bitcoin implementation written in Go (golang)"; homepage = "https://github.com/btcsuite/btcd"; + changelog = "https://github.com/btcsuite/btcd/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ _0xB10C ]; }; diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 9e7c0f26c624..81f9241453f5 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; + changelog = "https://github.com/bitcoin-core/btcdeb/releases"; license = licenses.mit; maintainers = with maintainers; [ akru ]; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 3d97da4895cb..b8cf51b73feb 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -31,6 +31,7 @@ buildDotnetModule rec { meta = with lib; { description = "Self-hosted, open-source cryptocurrency payment processor"; homepage = "https://btcpayserver.org"; + changelog = "https://github.com/btcpayserver/btcpayserver/blob/v${version}/Changelog.md"; maintainers = with maintainers; [ kcalvinalvin erikarvstedt ]; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 2879985e4b86..3838271d4924 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchFromGitHub { owner = "nix-community"; repo = "emacs2nix"; - rev = "8454f2857252f32621b8022f797fef9b96862204"; - hash = "sha256-UHHEkY+t/IzWe8jC8bm+p275sKfnL5/v5wbwRDw6FZw="; + rev = "9458961fc433a6c4cd91e7763f0aa1ef15f7b4aa"; + hash = "sha256-NJVKrYSF/22hrUJNJ3/znbcfHi/FtTePQ8Xzfp2eKAk="; fetchSubmodules = true; }; in diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 839205d3e44f..3cd4bb6dfbc8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2682,6 +2682,18 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; + copilot-lualine = buildVimPlugin { + pname = "copilot-lualine"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "AndreM222"; + repo = "copilot-lualine"; + rev = "f40450c3e138766026327e7807877ea860618258"; + sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; + }; + meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; + }; + copilot-lua = buildVimPlugin { pname = "copilot.lua"; version = "2024-09-11"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dc8151306bcd..1685585f8227 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -561,6 +561,12 @@ in dependencies = with self; [ copilot-lua plenary-nvim ]; }; + copilot-lualine = super.copilot-lualine.overrideAttrs { + dependencies = with self; [ copilot-lua lualine-nvim ]; + doInstallCheck = true; + nvimRequireCheck = "copilot-lualine"; + }; + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index dbcd60bb3b9a..c94388161d62 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -223,6 +223,7 @@ https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, https://github.com/zbirenbaum/copilot-cmp/,HEAD, +https://github.com/AndreM222/copilot-lualine/,HEAD, https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, https://github.com/ms-jpq/coq.artifacts/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index acdaa0e96bdc..c697b132534f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3903,6 +3903,8 @@ let }; }; + pylyzer.pylyzer = callPackage ./pylyzer.pylyzer { }; + pythagoratechnologies.gpt-pilot-vs-code = buildVscodeMarketplaceExtension { mktplcRef = { name = "gpt-pilot-vs-code"; diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index d9ab51bb6955..56fffc0080cd 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.8.1"; - hash = "sha256-dHvYl3bg5OB/HYBoHQnUODhAob/ZylFNGLAuUQByvdM="; + version = "1.9.1"; + hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix new file mode 100644 index 000000000000..c060c2c2982f --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix @@ -0,0 +1,18 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pylyzer"; + publisher = "pylyzer"; + version = "0.1.8"; + hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q="; + }; + + meta = { + description = "A VS Code extension for Pylyzer, a fast static code analyzer & language server for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=pylyzer.pylyzer"; + homepage = "https://github.com/mtshiba/pylyzer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 35f6601d60be..7f1b66714364 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0475kwa3ym14l9ggaf2hg4lcrc0lpi9vchzj4sgj4c3606l9i1aa"; - x86_64-darwin = "15sz42p7khzxpxii4zx14770kzyk4a3g1kwxjwvd46nxqjqciys4"; - aarch64-linux = "14d5p764vx1ppi5f6b6v0wrn1wr3qqyfr6mpncjhnzr2pdss9fz0"; - aarch64-darwin = "0kdh7a0nfpadhyn6cj89vw76hhbab4fg5wifbzdrjikwfg8jbd4b"; - armv7l-linux = "1aqlpxyzjrf6qm0znyqbl7srn251f7ra5lj594b7906lxhirin3c"; + x86_64-linux = "1adwsm4n934a5z3hnsj9k7mi2l4npl499q8jzk2xhbbpqhkvd96a"; + x86_64-darwin = "04cvhhxx7s14z5794gn3pwd482cswpqyrmb1qcwm797cz1rz29z5"; + aarch64-linux = "1fca5rir2bkf4wqrs56qhv3kwrxivx17pa5brxp1k4k8a9jmhy7k"; + aarch64-darwin = "1mwymizy2a6m9fj3r00h762283fwrkhl9kv5607r0q7widggfg0j"; + armv7l-linux = "16ndp0mcfb05wfarpq3nxp3bnac1s1yay596mwjmwbwv44qcq40b"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.93.1"; + version = "1.94.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40"; + rev = "d78a74bcdfad14d5d3b1b782f87255d802b57511"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0cxpv9q681nk7gjcs1msn2rnj8i86hlrkb0x4ja1id42aj4xwrqy"; + sha256 = "1iqglh4wx4wc80ihzcw4is7hd49s6kxpg9fz357r57a2679q0qw6"; }; }; diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index ac306cf5cdec..efdc4ff0d860 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Emulator of x86-based machines based on PCem"; mainProgram = "86Box"; homepage = "https://86box.net/"; + changelog = "https://github.com/86Box/86Box/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Only ] ++ lib.optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index 23e01e583148..6747f8781fb9 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -243,6 +243,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Open-source Darwin/macOS emulation layer for Linux"; homepage = "https://www.darlinghq.org"; + changelog = "https://github.com/darlinghq/darling/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ zhaofengli ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index 855e4cd18b3e..dc12dc2da62e 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.07.01"; + version = "2024.10.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-mOoOvmsBW6igi5BiLNcmTSKmTeEkBK9WwPu/WKBSJC4="; + hash = "sha256-qfrEy7OndhJ/UnfFDCp7qlIhYWANkUBy2ejYVvRrG3k="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 50805ae20dbb..cda07d42423c 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.dosbox.com/"; + changelog = "https://www.dosbox.com/wiki/Releases"; description = "DOS emulator"; longDescription = '' DOSBox is an emulator that recreates a MS-DOS compatible environment diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index 48f364751427..28d6c182c760 100644 --- a/pkgs/applications/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/nspire-emus/firebird"; + changelog = "https://github.com/nspire-emus/firebird/releases/tag/v${version}"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspireā„¢ calculators"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ pneumaticat ]; diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index 27f2a38f77a0..924bd2db4855 100644 --- a/pkgs/applications/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Medley Interlisp virtual machine"; homepage = "https://interlisp.org/"; + changelog = "https://github.com/Interlisp/maiko/releases"; license = licenses.mit; maintainers = with maintainers; [ ehmry ]; inherit (xorg.libX11.meta) platforms; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index a0ad2ab676db..631ee1843d2c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.3"; + version = "5.2.6"; kde-channel = "stable"; - hash = "sha256-RmpG7bk8PjetZSB8+WAjSJCnJ0Tg9E8shV3kx9iCXMA="; + hash = "sha256-SNcShVT99LTpLFSuMbUq95IfR6jabOyqBnRKu/yC1fs="; } diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index 01501e9757ef..35df09c2032c 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.19.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cb6BJg0wdfhqEFLbQ27NpjJU/cc4SZSk94UHzJfzn5U="; + sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index d4294a985a70..98c901da1265 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}"; + changelog = "https://github.com/linux-surface/iptsd/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index e6edfd9c4ab1..f44a44523aa1 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.1.8"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; + hash = "sha256-R4GW0e0tjLiCXQMf8iA+yYyMp43/28GeNsjs+QNQMSM="; }; - cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; + cargoHash = "sha256-eQyU0sMfecOjX5k1qYeetrAhk41FIMcg9QmhhTYOxWc="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index 102991f00256..587bf4ac4d7c 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; }; - buildInputs = [ ]; - installPhase = '' mkdir -p $out/bin cp -r * $out diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 9b616010dc30..8caf7c0fbe17 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { wasm-pack httplz ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.buildPlatform.isDarwin [ python3 ]; diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index a4305dbd1769..2947c31ce94d 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-2tl2jL/ikBAziwjgpP4JIDnAvpFGjm/U0etz+SC8xHk="; + hash = "sha256-A3uSbd3tXrXe3jvlppndyg3L2gi5eiaxIrPTKqD5vog="; }; - cargoHash = "sha256-rZVIlKK9TdIUabzmuRAzAnybz8mgDpto0nkImb8Mx8A="; + cargoHash = "sha256-b3loo6ZzZs3XwBI4JT9oth57vP3Aaulp24B7YDSnhhQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 32a7ab244054..65d064459e61 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.hostPlatform.isAarch64 then rec { pname = "brave"; - version = "1.70.119"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-we/M1/hMdnxxKfhS6q+Lc3G2OCj+wyBpoC6pfd0Ta08="; + hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU="; platform = "aarch64-linux"; } else if stdenv.hostPlatform.isx86_64 then rec { pname = "brave"; - version = "1.70.119"; + version = "1.70.123"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-GtFkE0R4s0G9pO2Omt1V+YvBv0kvyJrcPc41ba07TTQ="; + hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0582866e48b1..4c2ee8a3c357 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-08-19"; }; ungoogled-patches = { - hash = "sha256-LKtkNFb0y1v+p6hInulR7CrRO5pPk5J5Jd4nlAwZRwI="; - rev = "129.0.6668.70-1"; + hash = "sha256-fKMa/TxQRzteLIYMy+gn5fDvxLyrqtSwXHWxle0bhsE="; + rev = "129.0.6668.89-1"; }; }; - hash = "sha256-L9h9jbwEMcUi/cu7FP2O/6wD0Br/3SzWCazu7m9ua+o="; - version = "129.0.6668.70"; + hash = "sha256-+n9LjRLFvVB/pYkSrRCxln/Xn2paFyoY+mJGD73NtII="; + version = "129.0.6668.89"; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 320fecc21574..fae25a6ec623 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, buildGo121Module , buildGo122Module , fetchFromGitHub , nixosTests @@ -61,17 +60,7 @@ rec { nomad_1_5 = throwUnsupportaed "nomad_1_5"; - nomad_1_6 = generic { - buildGoModule = buildGo121Module; - version = "1.6.10"; - sha256 = "sha256-kiMdpJzjF0S7lrTX3sBFkWm0Gac9a+qlwCPcMKeVXXQ="; - vendorHash = "sha256-qnsPPV/NWTrqUa1v1CL16WfCH7B0zW9ZSnEmtqvotqI="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; + nomad_1_6 = throwUnsupportaed "nomad_1_6"; nomad_1_7 = generic { buildGoModule = buildGo122Module; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 95156944b8c7..ddabe261bfba 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.5.2"; + version = "4.5.3"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-H6pgPo2/RIpYnNOxP6PgIZhij1I45bm9DVkV2sNcW3A="; + sha256 = "sha256-TWmbpU27ZGG8L66TW3yWoxUO8M4N6mMOmLv2VVXM+Q4="; }; vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index a9994ef144ec..372722d3deb0 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-Ym0ypMfoceOvje1z1oCxjnFrl1oosMFSplM7bhI0KXU="; + sha256 = "sha256-Eb1pniSppowyQsLkCbbNlWtMCrDu4URqKXHnVFbA5lE="; }; - vendorHash = "sha256-44A9fF+HIOJrlxpps6GV3yjPBqfpwOhEZ8Ejnp2o/wk="; + vendorHash = "sha256-KQfsWbWwxznGkJB/KA/OkG8r8FnfsoSL90+mFUN9454="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index b9ce525a9cbb..918d07863734 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,10 +10,10 @@ }: let pname = "beeper"; - version = "3.108.3"; + version = "3.109.1"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage"; - hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.109.1-build-240923466rji1i4-x86_64.AppImage"; + hash = "sha256-RXpoOgnoPmNID5Jx/lNxqsHsifFSS9dZzhjSu8kGtXc="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix deleted file mode 100644 index b9183b2d7645..000000000000 --- a/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gperf -, file, ncurses, openssl, readline, sqlite, zlib -, AppKit, Cocoa, Foundation -}: - -stdenv.mkDerivation rec { - pname = "nchat"; - version = "3.67"; - - src = fetchFromGitHub { - owner = "d99kris"; - repo = "nchat"; - rev = "v${version}"; - hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI="; - }; - - postPatch = '' - substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ - --replace "get_git_head_revision" "#get_git_head_revision" - ''; - - nativeBuildInputs = [ cmake gperf ]; - - buildInputs = [ - file # for libmagic - ncurses - openssl - readline - sqlite - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ]; - - cmakeFlags = [ - "-DHAS_WHATSAPP=OFF" # go module build required - ]; - - meta = with lib; { - description = "Terminal-based chat client with support for Telegram and WhatsApp"; - mainProgram = "nchat"; - homepage = "https://github.com/d99kris/nchat"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index d20ef1f1817e..b1c2c9cc100d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.6"; + version = "0.13.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-OTKXLcLktWiSdRhGe7ioL2ViJQQcCjR1+2LlGoMnSgE="; + hash = "sha256-KeSKupExFIaLKdkXJw+UTclNaiMfrIomCec6GUV0E7M="; }; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index d4b48e7901bf..89688c3ecadf 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.129.27-2"; + version = "10.129.29-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-SHlKsiDS0UoOxy3vzGD7Ae7h6GM+r+XzFHZ33uEuEko="; + hash = "sha256-HGzBvCv6ASW2wXMd0BrA6NNGAEsuN2yHwS+0WbABfWM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index ba87e0f29364..9cc23fa2563d 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA="; + hash = "sha256-MQJQsM1nH6p91JWPR75iAvNox8eem4ZnM6n5DUxFzlE="; }; - cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM="; + cargoHash = "sha256-24sBTXE+2CeiietuSL3UNbsjkE25gnYkQtc62RgD6eM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index c60ee224aa2a..41597cb02945 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SelmqHauj5Yxg043NZqR4bhqW5clwg1h7UD8mW7j7vE="; + sha256 = "sha256-+EpPDA2+mBTdQjq6i9TN11yeXqvJA28JtmdNihM1a/U="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch b/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch deleted file mode 100644 index c35350d0008f..000000000000 --- a/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c -index b8f09a1f..f8a15c1b 100644 ---- a/libcrystfel/src/image-cbf.c -+++ b/libcrystfel/src/image-cbf.c -@@ -287,7 +287,7 @@ static float *read_cbf_data(const char *filename, int gz, int *w, int *h) - - } else { - -- #ifdef HAVE_ZLIB -+ #if defined(HAVE_ZLIB) && !(defined(__aarch64__) && defined(__APPLE__)) - gzFile gzfh; - int len_read; - size_t len; diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 0e60cb1fc260..bd8ac9ed4b97 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono, gitUpdater +}: let pname = "mission-planner"; @@ -12,11 +13,12 @@ let }; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.80"; + version = "1.3.82"; src = fetchurl { - url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; - sha256 = "sha256-iivlaQWtOMJHchmR92FoqTaosGJ9F1AgFtuFgDE/9qQ="; + url = + "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; + sha256 = "sha256-554fFDxHMo4jV3yrPdGgDYQ6XeW+TWdVIIkGQIBdrCQ="; }; nativeBuildInputs = [ makeWrapper mono unzip ]; @@ -44,6 +46,8 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "ArduPilot ground station"; mainProgram = "mission-planner"; diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix index 4eaf08d791ad..215c9c2b7581 100644 --- a/pkgs/applications/version-management/ungit/default.nix +++ b/pkgs/applications/version-management/ungit/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "ungit"; - version = "1.5.27"; + version = "1.5.28"; src = fetchFromGitHub { owner = "FredrikNoren"; repo = "ungit"; rev = "v${version}"; - hash = "sha256-UYY8AJWeGAcb83bmr7KX8ocxz8oQqUaXEXwwoVlwvoc="; + hash = "sha256-zLc+qzbbaQs6Y3NJFHupxyZ0QfuM/VW97dFESR+5dVQ="; }; - npmDepsHash = "sha256-AE0V+IoO9Yz80y81ayR08us4gyjjvshRVYPq6thpMr8="; + npmDepsHash = "sha256-pYOBdCb6G24JBGWOhd4fyVEEUn19D9t/GxjjIi/2ya0="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index dccb345b4ab4..686821482e6d 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -34,7 +34,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.0.1"; + version = "19.0.2"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -55,8 +55,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-dtwweoxUE/DwHoqwKCTp7vQUg09h4/TrNl92hpOKd1E=" - else "sha256-MNaP0+sKBH4Ps5EMM5Gtdncai+rXZRmIQBXF5lVbDws="; + then "sha256-q11stWFWRDUebAUzGH23R3Spd3EdDG85+6yB/srYCJY=" + else "sha256-dYTrO0wpIN68WhBovmYLK5uWOQ1nubpSyKqPCDMPMiM="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index fbedfe3d2223..4b1763d6a337 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.10.0"; + version = "6.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VI1fy8Oo4dXSn6IQoFlT+F9IyucLUqwuvkn5DoWRdSE="; + hash = "sha256-Vi5ddTyhCeGVYgfeSsJ8M3zmuZ++ftcgO5RRBe1bL4Y="; }; patches = [ @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { mock requests-mock freezegun - pytest-asyncio pytest-trio ]; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index fb5f28325260..f233dc4f82ca 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.18.2"; + version = "2.18.5"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-0057/lRisAw3fzh2LNqHUx72PR/67mW/cqm7hU34GAU="; + hash = "sha256-3mbO6HlJxEl9NZzJ8IaZWESqPzS7OTw+I+t0XH25D/Q="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f3eea8a5c171..965cca829d84 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -31,7 +31,6 @@ in stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; nativeBuildInputs = [ patchelf makeWrapper virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; - buildInputs = [ ]; buildPhase = '' runHook preBuild diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 999c8b4f2ae4..f0b9d34aa950 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -522,6 +522,89 @@ rec { */ writeFishBin = name: writeFish "/bin/${name}"; + /** + Like writeScript but the first line is a shebang to babashka + + Can be called with or without extra arguments. + + :::{.example} + ## `pkgs.writers.writeBabashka` without arguments + + ```nix + writeBabashka "example" '' + (println "hello world") + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeBabashka` with arguments + + ```nix + writeBabashka "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + (require '[babashka.tasks :as tasks]) + (tasks/shell "hello" "-g" "Hello babashka!") + '' + ``` + ::: + */ + writeBabashka = + name: argsOrScript: + if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then + makeScriptWriter ( + argsOrScript + // { + interpreter = "${lib.getExe pkgs.babashka}"; + check = "${lib.getExe pkgs.clj-kondo} --lint"; + } + ) name + else + makeScriptWriter { + interpreter = "${lib.getExe pkgs.babashka}"; + check = "${lib.getExe pkgs.clj-kondo} --lint"; + } name argsOrScript; + + /** + Like writeScriptBin but the first line is a shebang to babashka + + Can be called with or without extra arguments. + + # Examples + :::{.example} + ## `pkgs.writers.writeBabashkaBin` without arguments + + ```nix + writeBabashkaBin "example" '' + (println "hello world") + '' + ``` + ::: + + :::{.example} + ## `pkgs.writers.writeBabashkaBin` with arguments + + ```nix + writeBabashkaBin "example" + { + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}" + ]; + } + '' + (require '[babashka.tasks :as tasks]) + (tasks/shell "hello" "-g" "Hello babashka!") + '' + ``` + ::: + */ + writeBabashkaBin = name: writeBabashka "/bin/${name}"; + /** writeHaskell takes a name, an attrset with libraries and haskell version (both optional) and some haskell source code and returns an executable. diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 656d127930fa..b7e8452947f0 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -18,6 +18,8 @@ let makeFSharpWriter writeBash writeBashBin + writeBabashka + writeBabashkaBin writeDash writeDashBin writeFish @@ -85,6 +87,10 @@ recurseIntoAttrs { end ''); + babashka = expectSuccessBin (writeBabashkaBin "test-writers-babashka-bin" '' + (println "success") + ''); + rust = expectSuccessBin (writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") @@ -189,6 +195,10 @@ recurseIntoAttrs { echo "success" ''); + babashka = expectSuccess (writeBabashka "test-writers-babashka" '' + (println "success") + ''); + haskell = expectSuccess (writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default @@ -245,30 +255,32 @@ recurseIntoAttrs { # print(y[0]['test']) #''); - fsharp = expectSuccess (makeFSharpWriter { - libraries = { fetchNuGet }: [ - (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) - ]; - } "test-writers-fsharp" '' + # Commented out because fails with 'error FS0039: The value or constructor 'JsonFSharpConverter' is not defined.' - #r "nuget: FSharp.SystemTextJson, 0.17.4" - - module Json = - open System.Text.Json - open System.Text.Json.Serialization - let options = JsonSerializerOptions() - options.Converters.Add(JsonFSharpConverter()) - let serialize<'a> (o: 'a) = JsonSerializer.Serialize<'a>(o, options) - let deserialize<'a> (str: string) = JsonSerializer.Deserialize<'a>(str, options) - - type Letter = A | B - let a = {| Hello = Some "World"; Letter = A |} - if a |> Json.serialize |> Json.deserialize |> (=) a - then "success" - else "failed" - |> printfn "%s" - ''); + # fsharp = expectSuccess (makeFSharpWriter { + # libraries = { fetchNuGet }: [ + # (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) + # (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) + # ]; + # } "test-writers-fsharp" '' + # + # #r "nuget: FSharp.SystemTextJson, 0.17.4" + # + # module Json = + # open System.Text.Json + # open System.Text.Json.Serialization + # let options = JsonSerializerOptions() + # options.Converters.Add(JsonFSharpConverter()) + # let serialize<'a> (o: 'a) = JsonSerializer.Serialize<'a>(o, options) + # let deserialize<'a> (str: string) = JsonSerializer.Deserialize<'a>(str, options) + # + # type Letter = A | B + # let a = {| Hello = Some "World"; Letter = A |} + # if a |> Json.serialize |> Json.deserialize |> (=) a + # then "success" + # else "failed" + # |> printfn "%s" + # ''); #pypy2NoLibs = expectSuccess (writePyPy2 "test-writers-pypy2-no-libs" {} '' # print("success") @@ -369,6 +381,36 @@ recurseIntoAttrs { '' ); + babashka-bin = expectSuccessBin ( + writeBabashkaBin "test-writers-wrapping-babashka-bin" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + (when (= (System/getenv "ThaigerSprint") "Thailand") + (println "success")) + '' + ); + + babashka = expectSuccess ( + writeBabashka "test-writers-wrapping-babashka" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + (when (= (System/getenv "ThaigerSprint") "Thailand") + (println "success")) + '' + ); + python = expectSuccess ( writePython3 "test-writers-wrapping-python" { diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index a89165993e67..97b1ccc6595e 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/1oom-fork/1oom"; + changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${version}"; description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix index 53cecb99ef7e..c9223b7061fa 100644 --- a/pkgs/by-name/a5/a52dec/package.nix +++ b/pkgs/by-name/a5/a52dec/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.io/"; + changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${version}/ChangeLog?ref_type=tags"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wegank ]; mainProgram = "a52dec"; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index a7a745764710..5c2a5f8f43e6 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.7.17"; + version = "0.7.18"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-QPelXqJT3zbVP+lNiczrCR+JD4icimSyCravlIwTAyw="; + hash = "sha256-n8yclhjeEkkge9xHuM4ZW+7aubIiLWwxCmmGTI1bE9I="; }; - cargoHash = "sha256-7h1Hbtsk0pnoPXX5sFfzcZoH/sqcb0YTpmJp6yCzTG0="; + cargoHash = "sha256-Rn+y1W2Cimt5JrD2dLmvLmZshxyLO7N+oIALwGjxhvM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix index 68666e099c55..3d5cf0f5885b 100644 --- a/pkgs/by-name/ac/accerciser/package.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -68,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/accerciser"; + changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${version}/NEWS?ref_type=tags"; description = "Interactive Python accessibility explorer"; mainProgram = "accerciser"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix index 3ffe3c70f17c..62686f251f16 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fullcolor icon theme providing fallback for legacy apps"; homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy"; + changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; maintainers = teams.gnome.members; platforms = platforms.all; diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 1ea493890bf9..14d6b869e75d 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"; + changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${version}/NEWS?ref_type=tags"; platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix index e380929f6f62..c9b1c9d7c618 100644 --- a/pkgs/by-name/al/alacarte/package.nix +++ b/pkgs/by-name/al/alacarte/package.nix @@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/alacarte"; + changelog = "https://gitlab.gnome.org/GNOME/alacarte/-/blob/${version}/NEWS?ref_type=tags"; description = "Menu editor for GNOME using the freedesktop.org menu specification"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index e55b0c106d48..13de92ee294e 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.0.3"; + version = "2.0.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; - rev = version; - hash = "sha256-CXrnPhNu/doz145rvonuBXoJQolz7qgMdn5KgVio6J4="; + rev = "refs/tags/${version}"; + hash = "sha256-BLLcU2GESyHGFJJicE42V3nMFf/YfnYsXcAOPIHuCAg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix index 5498d05422ce..6483b967e7ba 100644 --- a/pkgs/by-name/ap/apfsprogs/package.nix +++ b/pkgs/by-name/ap/apfsprogs/package.nix @@ -6,20 +6,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "apfsprogs"; - version = "unstable-2023-11-30"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "990163894d871f51ba102a75aed384a275c5991b"; - hash = "sha256-yCShZ+ALzSe/svErt9/i1JyyEvbIeABGPbpS4lVil0A="; + rev = "f31d7c2d69d212ce381399d2bb1e91410f592484"; + hash = "sha256-+c+wU52XKNOTxSpSrkrNWoGEYw6Zo4CGEOyKMvkXEa0="; }; postPatch = let shortRev = builtins.substring 0 9 finalAttrs.src.rev; in '' substituteInPlace \ - apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile \ + apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \ --replace-fail \ '$(shell git describe --always HEAD | tail -c 9)' \ '${shortRev}' @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { make -C apfs-snap $makeFlags make -C apfsck $makeFlags make -C mkapfs $makeFlags + make -C apfs-label $makeFlags runHook postBuild ''; @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { make -C apfs-snap install DESTDIR="$out" $installFlags make -C apfsck install DESTDIR="$out" $installFlags make -C mkapfs install DESTDIR="$out" $installFlags + make -C apfs-label install DESTDIR="$out" $installFlags runHook postInstall ''; diff --git a/pkgs/by-name/at/atomix/package.nix b/pkgs/by-name/at/atomix/package.nix index 7721030bab3a..a7f3f8f01f6f 100644 --- a/pkgs/by-name/at/atomix/package.nix +++ b/pkgs/by-name/at/atomix/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Puzzle game where you move atoms to build a molecule"; mainProgram = "atomix"; homepage = "https://gitlab.gnome.org/GNOME/atomix"; + changelog = "https://gitlab.gnome.org/GNOME/atomix/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/az/azuki/package.nix b/pkgs/by-name/az/azuki/package.nix new file mode 100644 index 000000000000..8ab216a750e3 --- /dev/null +++ b/pkgs/by-name/az/azuki/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +let + fonts = [ + { + name = "azuki"; + downloadVersion = "121"; + hash = "sha256-AMpEJDD8lN0qWJ5C0y4V+/2JE/pKQrUHGfKHcnV+dhA="; + } + { + name = "azuki-b"; + downloadVersion = "B120"; + hash = "sha256-GoXnDX9H6D1X0QEgrD2jmQp7ek081PpO+xR3OdIY8Ck="; + } + { + name = "azuki-l"; + downloadVersion = "L120"; + hash = "sha256-rvWvSuvLnK3m2+iyKPQyIB1UGjg8dAW5oygjsLCQZ48="; + } + { + name = "azuki-lb"; + downloadVersion = "LB100"; + hash = "sha256-zpGomVshCe2W2Z2C5UGtVrJ2k7F//MftndSHPHmG290="; + } + { + name = "azuki-lp"; + downloadVersion = "LP100"; + hash = "sha256-Q/ND3dv8q7WTQx4oYVY5pTiGl4Ht89oA+tuCyfPOLUk="; + } + { + name = "azuki-p"; + downloadVersion = "P100"; + hash = "sha256-s4uodxyXP5R7jwkzjmg6qJZCllJ/MtgkkVOeELI8hLI="; + } + ]; + +in +stdenvNoCC.mkDerivation { + pname = "azuki"; + version = "0-unstable-2021-07-02"; + + sourceRoot = "azuki"; + + srcs = map ( + { + name, + downloadVersion, + hash, + }: + fetchzip { + url = "https://azukifont.com/font/azukifont${downloadVersion}.zip"; + stripRoot = false; + inherit name hash; + } + ) fonts; + + installPhase = '' + runHook preInstall + + for font in $srcs; do + install -Dm644 $font/azukifont*/*.ttf -t $out/share/fonts/truetype + done + + runHook postInstall + ''; + + meta = { + homepage = "http://azukifont.com/font/azuki.html"; + description = "Azuki Font"; + license = lib.licenses.unfree; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ nyadiia ]; + }; +} diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index af057af6b5cf..a989c6cb1fc4 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -5,6 +5,7 @@ lib, restic, util-linux, + stdenv, }: let pname = "backrest"; @@ -44,8 +45,17 @@ buildGoModule { nativeCheckInputs = [ util-linux ]; - # Fails with handler returned wrong content encoding - checkFlags = [ "-skip=TestServeIndex" ]; + checkFlags = + let + skippedTests = + [ + "TestServeIndex" # Fails with handler returned wrong content encoding + ] + ++ lib.optionals stdenv.isDarwin [ + "TestBackup" # relies on ionice + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; preCheck = '' # Use restic from nixpkgs, otherwise download fails in sandbox diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index e739e7b4fac0..7561af663e20 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.0"; + version = "1.5.1"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-cxDTNtxy2APAjnHw/cVd1/hUazASJs46rCHNGQ/JbSM="; + hash = "sha256-Vnbyq6NVJ/QtDqXT6IY/sjqsWqxs34C+ibebbx8Vp4E="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index e2c6726696f1..0a3522b96087 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.13.3"; + version = "5.14.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-LFiDyNuWbEAKU0Rl+n7ozxr5CM4NLphR2o9bYHw6xJY="; + hash = "sha256-cnItKuOu4ez54mAyRuk8PDC3oKKUIqdkAUuuaxNs5Z8="; }; patches = [ ]; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index cd5eb4a1f9b9..0bd36afc166b 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.18"; + version = "0.37.20"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-fiS4Z+Ao3DHyIal1GNXsCEgbLy1fsjbOdLcr7jNvhzA="; + hash = "sha256-PmCpm+ZOqnJdGrQtOciU6hEKV2lfoUT8bGtWzRpBXxQ="; }; - cargoHash = "sha256-GyHaVcrrq3v/d1WJmpteGwVkB9mLk+OIRDSkwR+aPMI="; + cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 3baec2ac9e6a..80c245f74637 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -1,37 +1,14 @@ { lib, git, - python3, + python3Packages, fetchFromGitHub, nix-update-script, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "charmcraft"; - version = "3.1.2"; + version = "3.2.1"; pyproject = true; @@ -39,14 +16,14 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-Qi2ZtAYgQlKj77QPovcT3RrPwAlEwaFyoJ0MAq4EETE="; + hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls="; }; postPatch = '' substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}" ''; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ craft-application craft-cli craft-parts @@ -58,7 +35,7 @@ python.pkgs.buildPythonApplication rec { humanize jinja2 jsonschema - pydantic_1 + pydantic python-dateutil pyyaml requests @@ -69,15 +46,15 @@ python.pkgs.buildPythonApplication rec { urllib3 ]; - build-system = with python.pkgs; [ - setuptools - setuptools-scm + build-system = with python3Packages; [ setuptools-scm ]; + + pythonRelaxDeps = [ + "urllib3" + "craft-application" ]; - pythonRelaxDeps = [ "urllib3" ]; - nativeCheckInputs = - with python.pkgs; + with python3Packages; [ hypothesis pyfakefs diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index ad8a222ac89a..59e36a2f298c 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -33,9 +33,8 @@ buildNpmPackage rec { nativeBuildInputs = [ makeWrapper electron - autoPatchelfHook # for onnx libs pkg-config - ]; + ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs buildInputs = [ stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 17b5e79c0d92..db260a067a39 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/cheese"; + changelog = "https://gitlab.gnome.org/GNOME/cheese/-/blob/${version}/NEWS?ref_type=tags"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 733a46a24f06..ffae0dd265ec 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.2"; + version = "2.52.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-SSwQQoHCcSVHMEpngpmdTThhwrob5/0TP9nQhOD6+1U="; + hash = "sha256-OoVf0Gxyd+hTlM4VOei1atNEZYL2ZF3eKAHyUqRkRzs="; }; - vendorHash = "sha256-t+lw1AtYnCBjJT+/pQZ71xycx4dJggqz08dNonbkP74="; + vendorHash = "sha256-QJkTscj3MvmscanEqA9Md2OZPYoNtxIJsAd2J6E9zHk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index 6bc82b7c07bf..bb8a4d98bdb7 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "bkryza"; repo = "clang-uml"; rev = finalAttrs.version; - hash = "sha256-PEzTvwW/wUg8wgKjeNGbpgpP3SH2sVWRYc6o3gFjxx0="; + hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/cobra-cli/default.nix b/pkgs/by-name/co/cobra-cli/package.nix similarity index 100% rename from pkgs/development/tools/cobra-cli/default.nix rename to pkgs/by-name/co/cobra-cli/package.nix diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix index bff7d838ec7b..91bbd5c6e88f 100644 --- a/pkgs/by-name/cr/crosswords/package.nix +++ b/pkgs/by-name/cr/crosswords/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Crossword player and editor for GNOME"; homepage = "https://gitlab.gnome.org/jrb/crosswords"; + changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags"; license = licenses.gpl3Plus; mainProgram = "crosswords"; maintainers = with maintainers; [ aleksana ]; diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix index cab49e4ddaa7..a56c08e4ec8f 100644 --- a/pkgs/by-name/cs/csv-tui/package.nix +++ b/pkgs/by-name/cs/csv-tui/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "csv-tui"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "nathangavin"; repo = "csv-tui"; rev = "v${version}"; - hash = "sha256-IRXLwZ2FHcCDmDVJ0xnV/4q+X2AFXPX/+Ph4Xxo3DyM="; + hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8="; }; - cargoHash = "sha256-wgeVcX0zSXffAuvKw2eKXC846WlC8F9UGMoxP3IXoLE="; + cargoHash = "sha256-WDUw539G15rf2X1NWLRCHIxMqyuxthEy8Cbn5XgIFCk="; meta = { description = "Terminal based csv editor which is designed to be memory efficient but still useful"; diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index c9a1cc13166d..aaf39f2ca14d 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { description = "GSettings editor for GNOME"; mainProgram = "dconf-editor"; homepage = "https://apps.gnome.org/DconfEditor/"; + changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix index ebacf8ea3ffc..82e0131edcad 100644 --- a/pkgs/by-name/de/decibels/package.nix +++ b/pkgs/by-name/de/decibels/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Play audio files"; homepage = "https://gitlab.gnome.org/GNOME/Incubator/decibels"; + changelog = "https://gitlab.gnome.org/GNOME/Incubator/decibels/-/blob/main/NEWS?ref_type=tags"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "org.gnome.Decibels"; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 3635f4027763..687d837952a2 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -113,6 +113,6 @@ rustPlatform.buildRustPackage rec { ]; # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. # Should be fixed with darwin SDK refactor and can be revisited. - broken = stdenv.isDarwin && stdenv.isx86_64; + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index c72db7c7e161..085374e32b54 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; mainProgram = "devhelp"; homepage = "https://apps.gnome.org/Devhelp/"; + changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index 24bf5a7ca242..a819f904e7fb 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://codeberg.org/dwl/dwl"; + changelog = "https://codeberg.org/dwl/dwl/src/branch/${finalAttrs.version}/CHANGELOG.md"; description = "Dynamic window manager for Wayland"; longDescription = '' dwl is a compact, hackable compositor for Wayland based on wlroots. It is diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/by-name/ek/eks-node-viewer/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/eks-node-viewer/default.nix rename to pkgs/by-name/ek/eks-node-viewer/package.nix diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 4cd9ee24860a..43973562e986 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -118,6 +118,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME image viewer"; homepage = "https://gitlab.gnome.org/GNOME/eog"; + changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 91e9ebba95d3..8dc34e210948 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -181,6 +181,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; + changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index ead32ff3b121..a58e248c2d76 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -6,32 +6,19 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-10-02"; + version = "0-unstable-2024-10-03"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "2654f290c3179aa143960e336e8985a8b6f6b72b"; - hash = "sha256-jaIeK3sn6Swi20DNnvDtSAIt3DXIN0OQDiozNUHqtjs="; + rev = "2b9dec20eb25f8708455e13eabc744d653b7a286"; + hash = "sha256-Iz65bs/ntTrxcifrPemAlK8zVjbwQfXsnUlcE1r4E/A="; }; build-system = with python3Packages; [ setuptools ]; - pythonRelaxDeps = [ - "aiohttp" - "aiofiles" - "blobfile" - "grpcio-tools" - "huggingface-hub" - "numpy" - "protobuf" - "pynvml" - "safetensors" - "tenacity" - "tokenizers" - "transformers" - ]; + pythonRelaxDeps = true; pythonRemoveDeps = [ "uuid" ]; diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 497bfe4920c9..91c463802353 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/file-roller"; + changelog = "https://gitlab.gnome.org/GNOME/file-roller/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/by-name/fl/flac123/package.nix b/pkgs/by-name/fl/flac123/package.nix index 9837a48c426e..6a2c4a442b0e 100644 --- a/pkgs/by-name/fl/flac123/package.nix +++ b/pkgs/by-name/fl/flac123/package.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/flac123/flac123"; + changelog = "https://github.com/flac123/flac123/blob/${finalAttrs.src.rev}/NEWS"; description = "Command-line program for playing FLAC audio files"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kiike ]; diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index bec47b7b302c..6e5add17471a 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { description = "CLI tool to losslessly compress JPEG and PNG images"; longDescription = "A CLI tool for x86-64 Linux machines that simplifies the task of maximally, losslessly compressing JPEG and PNG images for use in production web environments"; homepage = "https://github.com/Blobfolio/flaca"; + changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${version}"; maintainers = with maintainers; [ zzzsy ]; platforms = platforms.linux; license = licenses.wtfpl; diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index e89d27abe395..87cef9286687 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -124,6 +124,7 @@ stdenv'.mkDerivation { meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; + changelog = "https://github.com/flameshot-org/flameshot/releases"; mainProgram = "flameshot"; maintainers = with maintainers; [ scode diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 07e02231997c..ef1bb7f224ae 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Proxy server to bypass Cloudflare protection"; homepage = "https://github.com/FlareSolverr/FlareSolverr"; + changelog = "https://github.com/FlareSolverr/FlareSolverr/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; mainProgram = "flaresolverr"; maintainers = with maintainers; [ paveloom ]; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 8f3839130828..6d0aff14b531 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-SQltn4tbBGOFxascERG7J29vGz/jdq/4BWMH7P4BP64="; + hash = "sha256-SIBdiKgg444sZ8RUQscnOg8XzuAZcLvU4++0HY0G/ss="; }; # optional only to avoid linux rebuild diff --git a/pkgs/by-name/fo/four-in-a-row/package.nix b/pkgs/by-name/fo/four-in-a-row/package.nix index 6b10bcd9af45..96c9c9047584 100644 --- a/pkgs/by-name/fo/four-in-a-row/package.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/four-in-a-row"; + changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${version}/NEWS?ref_type=tags"; description = "Make lines of the same color to win"; mainProgram = "four-in-a-row"; maintainers = teams.gnome.members; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/by-name/g-/g-wrap/package.nix similarity index 100% rename from pkgs/development/tools/guile/g-wrap/default.nix rename to pkgs/by-name/g-/g-wrap/package.nix diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 0055b0cd378b..ab29a466ad3a 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Program that manages graphical display servers and handles graphical user logins"; homepage = "https://gitlab.gnome.org/GNOME/gdm"; + changelog = "https://gitlab.gnome.org/GNOME/gdm/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 33c77d9995e2..0b85d3af0776 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/geary"; + changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${version}/NEWS?ref_type=tags"; description = "Mail client for GNOME 3"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index bcd02935045b..3ba6da5b42c6 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.04"; + version = "6.19.05"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; rev = "refs/tags/v${version}"; - hash = "sha256-mKYAk3rXWBMgyxXenVRTGXIUG6ruz5/CxLmh8rpinfI="; + hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index a0de4d0c65b0..69e4c0f94ff0 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/ghex"; + changelog = "https://gitlab.gnome.org/GNOME/ghex/-/blob/${version}/NEWS?ref_type=tags"; description = "Hex editor for GNOME desktop environment"; mainProgram = "ghex"; platforms = platforms.linux; diff --git a/pkgs/by-name/gi/git-fixup/package.nix b/pkgs/by-name/gi/git-fixup/package.nix index 9a42a529e726..467870e33f32 100644 --- a/pkgs/by-name/gi/git-fixup/package.nix +++ b/pkgs/by-name/gi/git-fixup/package.nix @@ -1,4 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, git, coreutils, gnused, gnugrep }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + git, + coreutils, + gnused, + gnugrep, + nix-update-script, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "git-fixup"; @@ -28,9 +38,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/git-fixup \ - --prefix PATH : "${lib.makeBinPath [ git coreutils gnused gnugrep ]}" + --prefix PATH : "${ + lib.makeBinPath [ + git + coreutils + gnused + gnugrep + ] + }" ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fighting the copy-paste element of your rebase workflow"; homepage = "https://github.com/keis/git-fixup"; diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index 5c99f00c1206..c5071267ae8c 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gitg"; + changelog = "https://gitlab.gnome.org/GNOME/gitg/-/blob/v${version}/NEWS?ref_type=tags"; description = "GNOME GUI client to view git repositories"; mainProgram = "gitg"; maintainers = with maintainers; [ domenkozar Luflosi ]; diff --git a/pkgs/by-name/gn/gnome-2048/package.nix b/pkgs/by-name/gn/gnome-2048/package.nix index ac5c04dec0d0..2a1e8cf1c613 100644 --- a/pkgs/by-name/gn/gnome-2048/package.nix +++ b/pkgs/by-name/gn/gnome-2048/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-2048"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-2048/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Obtain the 2048 tile"; mainProgram = "gnome-2048"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 65edba55cb08..739475b78082 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Applets for use with the GNOME panel"; mainProgram = "cpufreq-selector"; homepage = "https://gitlab.gnome.org/GNOME/gnome-applets"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-applets/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index f9bf5ecf4ab5..3feadbad989c 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Default wallpaper set for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.cc-by-sa-30; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix index fe50b0958dec..715a2d6c453a 100644 --- a/pkgs/by-name/gn/gnome-bluetooth/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Application that lets you manage Bluetooth in the GNOME desktop"; mainProgram = "bluetooth-sendto"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 0ae01fc27aee..5f684618b910 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/connections"; + changelog = "https://gitlab.gnome.org/GNOME/connections/-/blob/${version}/NEWS?ref_type=tags"; description = "Remote desktop client for the GNOME desktop environment"; mainProgram = "gnome-connections"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index d8dae346f057..cd7f73765189 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -215,6 +215,7 @@ stdenv.mkDerivation (finalAttrs: { description = "GNOME 2.x-like session for GNOME 3"; mainProgram = "gnome-flashback"; homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index e2d3e9eefdcb..fb1a34e57c6c 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simple, easy, and safe way to prepare a new system"; homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index c26662eaec0b..959a3de5890f 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-klotski/package.nix b/pkgs/by-name/gn/gnome-klotski/package.nix index 6e47d856c64f..eed4c62178bd 100644 --- a/pkgs/by-name/gn/gnome-klotski/package.nix +++ b/pkgs/by-name/gn/gnome-klotski/package.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${version}/NEWS?ref_type=tags"; description = "Slide blocks to solve the puzzle"; mainProgram = "gnome-klotski"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index 85b4e5b93307..168e9a796290 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-mahjongg"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/blob/${version}/NEWS?ref_type=tags"; description = "Disassemble a pile of tiles by removing matching pairs"; mainProgram = "gnome-mahjongg"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index aba0819d9621..e6d018028da1 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Guide a worm around a maze"; mainProgram = "gnome-nibbles"; homepage = "https://gitlab.gnome.org/GNOME/gnome-nibbles"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix index fa1fe224c235..46a9fe58898d 100644 --- a/pkgs/by-name/gn/gnome-panel/package.nix +++ b/pkgs/by-name/gn/gnome-panel/package.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; mainProgram = "gnome-panel"; homepage = "https://gitlab.gnome.org/GNOME/gnome-panel"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-panel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 31896fef41b0..3c3e319767a3 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 6ac41501bc1c..dfe37b8dff4c 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-robots"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags"; description = "Avoid the robots and make them crash into each other"; mainProgram = "gnome-robots"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 87bf26868f4c..9b3dcd14718d 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "GNOME session manager"; homepage = "https://gitlab.gnome.org/GNOME/gnome-session"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-session/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index dbcf91b5bc49..f0a7bf588822 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index 31190a9e1f5b..c2f2a1bb42f3 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -237,6 +237,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Core user interface for the GNOME 3 desktop"; homepage = "https://gitlab.gnome.org/GNOME/gnome-shell"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix index bd7bfdf9532a..059e30b7aacc 100644 --- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { description = "Simple and modern sound recorder"; mainProgram = "gnome-sound-recorder"; homepage = "https://gitlab.gnome.org/World/vocalis"; + changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 8e45b5e155ff..be14eb6d74a0 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 1cbe5a2c32c7..2edd058907b0 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-text-editor"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Text Editor for GNOME"; mainProgram = "gnome-text-editor"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix index 6c4fdddcf662..db5fd2e68c10 100644 --- a/pkgs/by-name/gn/gnome-tour/package.nix +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-tour/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME Greeter & Tour"; mainProgram = "gnome-tour"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index bfe7dd5bfaa5..1f7f8a0a3aaa 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-user-share"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix index 13c073def1bf..5b92d9920489 100644 --- a/pkgs/by-name/go/go-secdump/package.nix +++ b/pkgs/by-name/go/go-secdump/package.nix @@ -29,5 +29,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "go-secdump"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix index 0b618c195d5a..cbe9930a1059 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "goss"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xabGzCTzWwT8568xg6sdlE32OYPXlG9Fei0DoyAoXgo="; + hash = "sha256-GdkLasokpWegjK4kZzAskp1NGwcuMjrjjau75cEo8kg="; }; - vendorHash = "sha256-BPW4nC9gxDbyhA5UOfFAtOIusNvwJ7pQiprZsqTiak0="; + vendorHash = "sha256-Rf6Xt54y1BN2o90rDW0WvEm4H5pPfsZ786MXFjsAFaM="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 16da276b64b5..02c6199f0958 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; + changelog = "https://github.com/Keruspe/GPaste/blob/v${finalAttrs.version}/NEWS"; description = "Clipboard management system with GNOME integration"; mainProgram = "gpaste-client"; license = licenses.bsd2; diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/by-name/gr/granted/package.nix similarity index 100% rename from pkgs/tools/admin/granted/default.nix rename to pkgs/by-name/gr/granted/package.nix diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/by-name/gu/guile-cairo/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-cairo/default.nix rename to pkgs/by-name/gu/guile-cairo/package.nix diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/by-name/gu/guile-commonmark/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-commonmark/default.nix rename to pkgs/by-name/gu/guile-commonmark/package.nix diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/by-name/gu/guile-config/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-config/default.nix rename to pkgs/by-name/gu/guile-config/package.nix diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/by-name/gu/guile-fibers/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-fibers/default.nix rename to pkgs/by-name/gu/guile-fibers/package.nix diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gcrypt/default.nix rename to pkgs/by-name/gu/guile-gcrypt/package.nix diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/by-name/gu/guile-git/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-git/default.nix rename to pkgs/by-name/gu/guile-git/package.nix diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/by-name/gu/guile-gnutls/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-gnutls/default.nix rename to pkgs/by-name/gu/guile-gnutls/package.nix diff --git a/pkgs/development/tools/guile/guile-hall/default.nix b/pkgs/by-name/gu/guile-hall/package.nix similarity index 100% rename from pkgs/development/tools/guile/guile-hall/default.nix rename to pkgs/by-name/gu/guile-hall/package.nix diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/by-name/gu/guile-json/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-json/default.nix rename to pkgs/by-name/gu/guile-json/package.nix diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/by-name/gu/guile-lib/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-lib/default.nix rename to pkgs/by-name/gu/guile-lib/package.nix diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/by-name/gu/guile-ncurses/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ncurses/default.nix rename to pkgs/by-name/gu/guile-ncurses/package.nix diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/by-name/gu/guile-opengl/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-opengl/default.nix rename to pkgs/by-name/gu/guile-opengl/package.nix diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/by-name/gu/guile-reader/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-reader/default.nix rename to pkgs/by-name/gu/guile-reader/package.nix diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/by-name/gu/guile-sdl2/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-sdl2/default.nix rename to pkgs/by-name/gu/guile-sdl2/package.nix diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/by-name/gu/guile-ssh/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-ssh/default.nix rename to pkgs/by-name/gu/guile-ssh/package.nix diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/by-name/gu/guile-xcb/package.nix similarity index 100% rename from pkgs/development/guile-modules/guile-xcb/default.nix rename to pkgs/by-name/gu/guile-xcb/package.nix diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix index d3ea63a41311..90eb4dfefec4 100644 --- a/pkgs/by-name/gu/guix/package.nix +++ b/pkgs/by-name/gu/guix/package.nix @@ -154,6 +154,7 @@ stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; homepage = "http://www.gnu.org/software/guix"; + changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; mainProgram = "guix"; maintainers = with maintainers; [ cafkafk foo-dogsquared ]; diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix index 7ff34db4327d..3540336c8178 100644 --- a/pkgs/by-name/gx/gxml/package.nix +++ b/pkgs/by-name/gx/gxml/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML"; homepage = "https://gitlab.gnome.org/GNOME/gxml"; + changelog = "https://gitlab.gnome.org/GNOME/gxml/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ jmarmstrong1207 ] ++ teams.gnome.members; diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix index 8386ee9128dd..7c0a417a84fc 100644 --- a/pkgs/by-name/he/hexbinhex/package.nix +++ b/pkgs/by-name/he/hexbinhex/package.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dj-on-github/hexbinhex"; + changelog = "https://github.com/dj-on-github/hexbinhex/releases/tag/${src.rev}"; description = '' Six utility programs to convert between hex, binary, ascii-binary and the oddball NIST format for 90B testing. diff --git a/pkgs/by-name/hi/hitori/package.nix b/pkgs/by-name/hi/hitori/package.nix index 574efd430393..ad321c355dad 100644 --- a/pkgs/by-name/hi/hitori/package.nix +++ b/pkgs/by-name/hi/hitori/package.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/hitori"; + changelog = "https://gitlab.gnome.org/GNOME/hitori/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GTK application to generate and let you play games of Hitori"; mainProgram = "hitori"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix new file mode 100644 index 000000000000..1866e7212e1f --- /dev/null +++ b/pkgs/by-name/hy/hyperhdr/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, flatbuffers +, libjpeg_turbo +, mbedtls +, mdns +, pipewire +, qt6Packages +, qmqtt +, xz +}: + +let + inherit (lib) + cmakeBool + ; +in + +stdenv.mkDerivation rec { + pname = "hyperhdr"; + version = "20.0.0.0"; + + src = fetchFromGitHub { + owner = "awawa-dev"; + repo = "HyperHDR"; + rev = "refs/tags/v${version}"; + hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6Packages.wrapQtAppsHook + ]; + + cmakeFlags = [ + "-DPLATFORM=linux" + (cmakeBool "USE_SYSTEM_MQTT_LIBS" true) + (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true) + (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true) + ]; + + buildInputs = [ + alsa-lib + flatbuffers + libjpeg_turbo + mdns + mbedtls + pipewire + qmqtt + qt6Packages.qtbase + qt6Packages.qtserialport + xz + ]; + + meta = with lib; { + description = "Highly optimized open source ambient lighting implementation based on modern digital video and audio stream analysis for Windows, macOS and Linux (x86 and Raspberry Pi / ARM"; + homepage = "https://github.com/awawa-dev/HyperHDR"; + changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "hyperhdr"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/hy/hyprland/asahi-fix.patch b/pkgs/by-name/hy/hyprland/asahi-fix.patch deleted file mode 100644 index 80791045e285..000000000000 --- a/pkgs/by-name/hy/hyprland/asahi-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp -index 0fbf832e..c6077114 100644 ---- a/src/protocols/LinuxDMABUF.cpp -+++ b/src/protocols/LinuxDMABUF.cpp -@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const - return; - } - } else { -- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); -+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null"); - drmFreeDevice(&device); -- removeGlobal(); - } - }); - } diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix index 6b001806299a..a4f9c53daf02 100644 --- a/pkgs/by-name/i2/i2p/package.nix +++ b/pkgs/by-name/i2/i2p/package.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Applications and router for I2P, anonymity over the Internet"; homepage = "https://geti2p.net"; + changelog = "https://github.com/i2p/i2p.i2p/releases/tag/i2p-${finalAttrs.version}"; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # source bundles dependencies as jars diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix similarity index 100% rename from pkgs/tools/misc/iam-policy-json-to-terraform/default.nix rename to pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix index 3677f6f8d780..8d6a67529b72 100644 --- a/pkgs/by-name/id/ideamaker/package.nix +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -216,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.raise3d.com/ideamaker/"; + changelog = "https://www.raise3d.com/download/ideamaker-release-notes/"; description = "Raise3D's 3D slicer software"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 9916500c585b..4ad62dff661a 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -38,6 +38,7 @@ buildNpmPackage rec { description = "Video game ROM collection manager to help filter, sort, patch, archive, and report on collections on any OS"; mainProgram = "igir"; homepage = "https://igir.io"; + changelog = "https://github.com/emmercm/igir/releases/tag/${src.rev}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch b/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch deleted file mode 100644 index 10ca57733409..000000000000 --- a/pkgs/by-name/in/incus/58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Fri, 6 Sep 2024 17:10:01 -0400 -Subject: [PATCH] incusd/instance/qemu: Force threads I/O mode for - unsafe/writeback -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The default "native" aioMode requires direct I/O which is incompatible -with unsafe/writeback. - -Signed-off-by: StĆ©phane Graber ---- - internal/server/instance/drivers/driver_qemu.go | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go -index 9609b73c1b..a5a4944d40 100644 ---- a/internal/server/instance/drivers/driver_qemu.go -+++ b/internal/server/instance/drivers/driver_qemu.go -@@ -4088,9 +4088,11 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - noFlushCache := false // Don't ignore any flush requests for the device. - - if cacheMode == "unsafe" { -+ aioMode = "threads" - directCache = false - noFlushCache = true - } else if cacheMode == "writeback" { -+ aioMode = "threads" - directCache = false - } - diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index d7383c210b12..5819ee61744f 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,11 +1,6 @@ import ./generic.nix { - hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc="; - version = "6.5.0"; - vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk="; - patches = [ - # qemu 9.1 compat, remove in 6.6 - ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch - ./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch - ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch - ]; + hash = "sha256-hjBJGtIBYwgPpnWb1337RP1jU9rQNLQ3yp1AnwBH13o="; + version = "6.6.0"; + vendorHash = "sha256-Cpbgn2WHMVKtPrAzuNnXkS1rYvzLwde6oTcKTKW3XHs="; + patches = [ ]; } diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix index a968dd923196..416af017b6cd 100644 --- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix +++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { to MobileSafari and UIWebViews on real and simulated iOS devices. ''; homepage = "https://github.com/google/ios-webkit-debug-proxy"; + changelog = "https://github.com/google/ios-webkit-debug-proxy/releases/tag/${finalAttrs.src.rev}"; license = licenses.bsd3; mainProgram = "ios_webkit_debug_proxy"; maintainers = with maintainers; [ diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix index a832bc953333..f7b36dfa3539 100644 --- a/pkgs/by-name/j/j/package.nix +++ b/pkgs/by-name/j/j/package.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jsoftware.com/"; + changelog = "https://code.jsoftware.com/wiki/System/ReleaseNotes"; description = "J programming language, an ASCII-based APL successor"; longDescription = '' J is a high-level, general-purpose programming language that is diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix index 6fd632af1a6a..6de7a5096d9a 100644 --- a/pkgs/by-name/jc/jcli/package.nix +++ b/pkgs/by-name/jc/jcli/package.nix @@ -43,6 +43,7 @@ buildGoModule rec { description = "Jenkins CLI allows you to manage your Jenkins in an easy way"; mainProgram = "jcli"; homepage = "https://github.com/jenkins-zh/jenkins-cli"; + changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; }; diff --git a/pkgs/by-name/js/json2ts/package.nix b/pkgs/by-name/js/json2ts/package.nix index 38243c4d4a2f..1518898b3de4 100644 --- a/pkgs/by-name/js/json2ts/package.nix +++ b/pkgs/by-name/js/json2ts/package.nix @@ -18,6 +18,7 @@ buildNpmPackage { mainProgram = "json2ts"; description = "Compile JSON Schema to TypeScript type declarations"; homepage = "https://github.com/bcherny/json-schema-to-typescript"; + changelog = "https://github.com/bcherny/json-schema-to-typescript/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hsjobeki ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/by-name/kr/krelay/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/krelay/default.nix rename to pkgs/by-name/kr/krelay/package.nix diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/by-name/ku/kubecolor/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubecolor/default.nix rename to pkgs/by-name/ku/kubecolor/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-images/default.nix b/pkgs/by-name/ku/kubectl-images/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-images/default.nix rename to pkgs/by-name/ku/kubectl-images/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-ktop/default.nix rename to pkgs/by-name/ku/kubectl-ktop/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/pkgs/by-name/ku/kubectl-tree/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-tree/default.nix rename to pkgs/by-name/ku/kubectl-tree/package.nix diff --git a/pkgs/by-name/ky/kyua/package.nix b/pkgs/by-name/ky/kyua/package.nix index bec61ceeb4b5..c3d4b7fc49b1 100644 --- a/pkgs/by-name/ky/kyua/package.nix +++ b/pkgs/by-name/ky/kyua/package.nix @@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Testing framework for infrastructure software"; homepage = "https://github.com/freebsd/kyua/"; + changelog = "https://github.com/freebsd/kyua/blob/master/NEWS.md"; license = lib.licenses.bsd3; mainProgram = "kyua"; maintainers = with lib.maintainers; [ reckenrode ]; diff --git a/pkgs/by-name/la/labctl/package.nix b/pkgs/by-name/la/labctl/package.nix index 231d0984b207..987b5461611d 100644 --- a/pkgs/by-name/la/labctl/package.nix +++ b/pkgs/by-name/la/labctl/package.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { description = "collection of helper tools for network engineers, while configuring and experimenting with their own network labs"; homepage = "https://labctl.net"; + changelog = "https://github.com/labctl/labctl/releases"; license = licenses.asl20; maintainers = [ ]; mainProgram = "labctl"; diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index f853dd5635f6..4816f4f99c50 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-h7M45e8DDfpZix4Ej6fqSMQIP0zEUvCXfthJLzpIY18="; + hash = "sha256-vJziNgVYcnJfmAnok2OeYZEOwGtGfhZyup3D3+BuZsU="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 631e6e623b9e..00891ba921a5 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk"; + changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl21Plus; diff --git a/pkgs/by-name/li/libgnome-keyring/package.nix b/pkgs/by-name/li/libgnome-keyring/package.nix index 0275365b3336..5e6c6f0c02ea 100644 --- a/pkgs/by-name/li/libgnome-keyring/package.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; + changelog = "https://gitlab.gnome.org/Archive/libgnome-keyring/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; pkgConfigModules = [ "gnome-keyring-1" ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libipuz/package.nix b/pkgs/by-name/li/libipuz/package.nix index 5cc94ca9a657..5ea6b5527bb6 100644 --- a/pkgs/by-name/li/libipuz/package.nix +++ b/pkgs/by-name/li/libipuz/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for parsing .ipuz puzzle files"; homepage = "https://gitlab.gnome.org/jrb/libipuz"; + changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${version}/NEWS.md?ref_type=tags"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ aleksana ]; platforms = platforms.unix; diff --git a/pkgs/by-name/li/libmsgraph/package.nix b/pkgs/by-name/li/libmsgraph/package.nix index 011d4bab9a81..8a133e947135 100644 --- a/pkgs/by-name/li/libmsgraph/package.nix +++ b/pkgs/by-name/li/libmsgraph/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library to access MS Graph API for Office 365"; homepage = "https://gitlab.gnome.org/GNOME/msgraph"; + changelog = "https://gitlab.gnome.org/GNOME/msgraph/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix index 02030cb169cc..b1c6a82baa01 100644 --- a/pkgs/by-name/li/lightsoff/package.nix +++ b/pkgs/by-name/li/lightsoff/package.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/lightsoff"; + changelog = "https://gitlab.gnome.org/GNOME/lightsoff/-/blob/${version}/NEWS?ref_type=tags"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; mainProgram = "lightsoff"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index eec787879423..daa6084989a4 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/guidog/livi"; + changelog = "https://gitlab.gnome.org/guidog/livi/-/blob/v${version}/NEWS?ref_type=tags"; description = "Small video player targeting mobile devices (also named μPlayer)"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index cfc7edfacc2b..4b2e56deee8f 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/epoupon/lms"; + changelog = "https://github.com/epoupon/lms/releases/tag/${src.rev}"; description = "Lightweight Music Server - Access your self-hosted music using a web interface"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index c5de24d28958..19b3d5b48614 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/loupe"; + changelog = "https://gitlab.gnome.org/GNOME/loupe/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Simple image viewer application written with GTK4 and Rust"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jk ] ++ teams.gnome.members; diff --git a/pkgs/by-name/ma/mangl/package.nix b/pkgs/by-name/ma/mangl/package.nix new file mode 100644 index 000000000000..699babd5ae4f --- /dev/null +++ b/pkgs/by-name/ma/mangl/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchFromGitHub, + lib, + glfw, + freetype, + pkg-config, + bzip2, + zlib, +}: + +stdenv.mkDerivation { + pname = "mangl"; + version = "1.1.5-unstable-2024-07-10"; + src = fetchFromGitHub { + owner = "zigalenarcic"; + repo = "mangl"; + rev = "9d369fb0b9637969bbdfaafca73832fe8a31445b"; + hash = "sha256-22JnflZtlkjI3wr6UHweb77pOk9cMwF+c6KORutCSDM="; + }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + glfw + bzip2 + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm0555 mangl -t $out/bin + install -Dm0444 mangl.1 -t $out/man/man1 + install -Dm0444 art/mangl.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm0444 mangl.desktop -t $out/share/applications + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/zigalenarcic/mangl"; + description = "A graphical man page viewer based on the mandoc library"; + license = licenses.bsd2; + maintainers = with maintainers; [ nrabulinski ]; + platforms = platforms.linux; + mainProgram = "mangl"; + }; +} diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix new file mode 100644 index 000000000000..245b5a234c3e --- /dev/null +++ b/pkgs/by-name/md/mdns/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "mdns"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "mjansson"; + repo = "mdns"; + rev = version; + hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Public domain mDNS/DNS-SD library in C"; + homepage = "https://github.com/mjansson/mdns"; + changelog = "https://github.com/mjansson/mdns/blob/${src.rev}/CHANGELOG"; + license = licenses.unlicense; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch b/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch deleted file mode 100644 index ff9440905310..000000000000 --- a/pkgs/by-name/me/meson/0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8304b645c655832c47ee9ca706d182c26d29eaff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Tue, 9 Apr 2024 06:35:39 +0000 -Subject: [PATCH] Revert "rust: recursively pull proc-macro dependencies as - well" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit aee941559c4b88a062e88186819a820c69c200ae. - -Signed-off-by: Jƶrg Thalheim ---- - mesonbuild/build.py | 2 ++ - test cases/rust/18 proc-macro/lib.rs | 8 -------- - test cases/rust/18 proc-macro/meson.build | 11 ----------- - test cases/rust/18 proc-macro/subdir/meson.build | 1 - - .../rust/18 proc-macro/transitive-proc-macro.rs | 7 ------- - 5 files changed, 2 insertions(+), 27 deletions(-) - delete mode 100644 test cases/rust/18 proc-macro/lib.rs - delete mode 100644 test cases/rust/18 proc-macro/subdir/meson.build - delete mode 100644 test cases/rust/18 proc-macro/transitive-proc-macro.rs - -diff --git a/mesonbuild/build.py b/mesonbuild/build.py -index 6f0d6a2dd..7be9b497b 100644 ---- a/mesonbuild/build.py -+++ b/mesonbuild/build.py -@@ -1295,6 +1295,8 @@ def get_dependencies_recurse(self, result: OrderedSet[BuildTargetTypes], include - for t in self.link_targets: - if t in result: - continue -+ if t.rust_crate_type == 'proc-macro': -+ continue - if include_internals or not t.is_internal(): - result.add(t) - if isinstance(t, StaticLibrary): -diff --git a/test cases/rust/18 proc-macro/lib.rs b/test cases/rust/18 proc-macro/lib.rs -deleted file mode 100644 -index 5242886cc..000000000 ---- a/test cases/rust/18 proc-macro/lib.rs -+++ /dev/null -@@ -1,8 +0,0 @@ --extern crate proc_macro_examples; --use proc_macro_examples::make_answer; -- --make_answer!(); -- --pub fn func() -> u32 { -- answer() --} -diff --git a/test cases/rust/18 proc-macro/meson.build b/test cases/rust/18 proc-macro/meson.build -index e8b28eda1..c5f0dfc82 100644 ---- a/test cases/rust/18 proc-macro/meson.build -+++ b/test cases/rust/18 proc-macro/meson.build -@@ -31,14 +31,3 @@ main = executable( - ) - - test('main_test2', main) -- --subdir('subdir') -- --staticlib = static_library('staticlib', 'lib.rs', -- link_with: pm_in_subdir, -- rust_dependency_map : {'proc_macro_examples3' : 'proc_macro_examples'} --) -- --executable('transitive-proc-macro', 'transitive-proc-macro.rs', -- link_with: staticlib, --) -diff --git a/test cases/rust/18 proc-macro/subdir/meson.build b/test cases/rust/18 proc-macro/subdir/meson.build -deleted file mode 100644 -index 04842c431..000000000 ---- a/test cases/rust/18 proc-macro/subdir/meson.build -+++ /dev/null -@@ -1 +0,0 @@ --pm_in_subdir = rust.proc_macro('proc_macro_examples3', '../proc.rs') -diff --git a/test cases/rust/18 proc-macro/transitive-proc-macro.rs b/test cases/rust/18 proc-macro/transitive-proc-macro.rs -deleted file mode 100644 -index 4c804b3b6..000000000 ---- a/test cases/rust/18 proc-macro/transitive-proc-macro.rs -+++ /dev/null -@@ -1,7 +0,0 @@ --extern crate staticlib; --use staticlib::func; -- -- --fn main() { -- assert_eq!(42, func()); --} --- -2.44.0 - diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 3904fb25edb2..c5691dd8fab7 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Window manager used in Gnome Flashback"; homepage = "https://gitlab.gnome.org/GNOME/metacity"; + changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 09d4ed448ca8..7177480ad8f4 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.8"; + version = "1.18.9"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-UImkDjfNbC59SkoR0SsmlxGO5UPjMA0IURj+2+zgsVQ="; + hash = "sha256-WVzJymXmtPV5AGYYuFDlrhy5Hh9eUBOFG8UhAnFZ22g="; }; - vendorHash = "sha256-Lrd+og6bOopbV/JDwfWY4X+D/2iOCMgDA+JlHJlxwXE="; + vendorHash = "sha256-A10XICoieWc0FJAn2G2aolefLjguwL72qrr4KjMFYZE="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 1c364e7c3a5f..b655159815f2 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -11,6 +11,7 @@ jemalloc, ffmpeg-headless, writeShellScript, + xcbuild, ... }: @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm.configHook makeWrapper python3 - ]; + ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 45b7b0f62015..b4e43dbe5cfc 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for polynomial system solving through algebraic methods"; mainProgram = "msolve"; homepage = "https://msolve.lip6.fr"; + changelog = "https://github.com/algebraic-solving/msolve/releases/tag/${finalAttrs.src.rev}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index b4662af7b598..8c847f3c365b 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.3"; + version = "13.5.6"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-rJKOkVfWs5q3eF+ffeBLIQaAMtoR7KzoNQlv64iNWJ8="; + hash = "sha256-AayGWFfsdAK9Ku4J4nDolJxnQn0HhGeZeEf//9OspWA="; }; }; diff --git a/pkgs/by-name/mu/mullvad-browser/update.nix b/pkgs/by-name/mu/mullvad-browser/update.nix index 04b69d8ce208..7faf4c31efbf 100644 --- a/pkgs/by-name/mu/mullvad-browser/update.nix +++ b/pkgs/by-name/mu/mullvad-browser/update.nix @@ -56,7 +56,7 @@ in writeShellScript "update-${pname}" '' for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" - sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) + sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | head -1 | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 82e3f951f16c..720c78526070 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -207,6 +207,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Window manager for GNOME"; mainProgram = "mutter"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; + changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix new file mode 100644 index 000000000000..df72bce1cb02 --- /dev/null +++ b/pkgs/by-name/nc/nchat/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + file, # for libmagic + ncurses, + openssl, + readline, + sqlite, + zlib, + cmake, + gperf, + stdenv, + darwin, +}: + +stdenv.mkDerivation rec { + pname = "nchat"; + version = "5.2.11"; + + src = fetchFromGitHub { + owner = "d99kris"; + repo = "nchat"; + rev = "refs/tags/v${version}"; + hash = "sha256-LcTVftLKlzHstSaJjdtqoEmQ7kiqft9dbXRXoYjbaus="; + }; + + postPatch = '' + substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ + --replace "get_git_head_revision" "#get_git_head_revision" + substituteInPlace lib/tgchat/CMakeLists.txt \ + --replace-fail "list(APPEND OPENSSL_ROOT_DIR" "#list(APPEND OPENSSL_ROOT_DIR" + ''; + + nativeBuildInputs = [ + cmake + gperf + ]; + + buildInputs = + [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + Cocoa + Foundation + ] + ); + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DHAS_WHATSAPP=OFF" # go module build required + ]; + + meta = { + description = "Terminal-based chat client with support for Telegram and WhatsApp"; + changelog = "https://github.com/d99kris/nchat/releases/tag/v${version}"; + homepage = "https://github.com/d99kris/nchat"; + license = lib.licenses.mit; + mainProgram = "nchat"; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + sikmir + ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index b37ba7fd2d94..886444b9442f 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -66,15 +66,15 @@ stdenv.mkDerivation (finalAttrs: in { pname = "neovim-unwrapped"; - version = "0.10.1"; + version = "0.10.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; - rev = "v${finalAttrs.version}"; - hash = "sha256-OsHIacgorYnB/dPbzl1b6rYUzQdhTtsJYLsFLJxregk="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-+qjjelYMB3MyjaESfCaGoeBURUzSVh/50uxUqStxIfY="; }; patches = [ diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index b6a3b6974d74..b3dee524f7a7 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -47,8 +47,12 @@ stdenv.mkDerivation rec { ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); - cmakeFlags = - [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" + cmakeFlags = let + # the specified version must always start with "nextpnr-", so add it if + # missing (e.g. if the user overrides with a git hash) + rev = main_src.rev; + version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}"; + in ["-DCURRENT_GIT_VERSION=${version}" "-DARCH=generic;ice40;ecp5;gowin;himbaechel" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index e90fc8ec322e..32a6f1a322ec 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; + changelog = "https://nmap.org/changelog.html#${version}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix index 1b4e25912e4d..682e7f1f2d12 100644 --- a/pkgs/by-name/nm/nmapsi4/package.nix +++ b/pkgs/by-name/nm/nmapsi4/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt frontend for nmap"; mainProgram = "nmapsi4"; + changelog = "https://github.com/nmapsi4/nmapsi4/releases/tag/${src.rev}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ peterhoeg ]; inherit (src.meta) homepage; diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index 1ed6df2779c0..201e25b5a6a0 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,7 +5,7 @@ }: let pname = "nuclear"; - version = "0.6.31"; + version = "0.6.39"; src = fetchurl { # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in @@ -13,7 +13,7 @@ let # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-ezho69fDP4OiLpC8KNKc8OIZ++TX4GUinFB6o8MLx3I="; + hash = "sha256-X5IQ9NlFTFTEYDhuCyrzkPGmvNK66nCSdbmJZxObkBo="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix index 0ea859435e9e..ca2a1444a02c 100644 --- a/pkgs/by-name/od/odoo15/package.nix +++ b/pkgs/by-name/od/odoo15/package.nix @@ -17,8 +17,6 @@ let hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; }; - nativeBuildInputs = [ ]; - nativeCheckInputs = with self; [ pytestCheckHook pillow ]; }); flask = super.flask.overridePythonAttrs (old: rec { diff --git a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch deleted file mode 100644 index 56422f099218..000000000000 --- a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in -index 8529d89fe..94879ee01 100644 ---- a/thrust/thrust/cmake/thrust-header-search.cmake.in -+++ b/thrust/thrust/cmake/thrust-header-search.cmake.in -@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@") - find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h - NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search - NO_DEFAULT_PATH # Only search explicit paths below: -- PATHS -- "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" -+ PATHS "@CMAKE_INSTALL_INCLUDEDIR@" - ) - set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/pkgs/development/tools/overcommit/Gemfile b/pkgs/by-name/ov/overcommit/Gemfile similarity index 100% rename from pkgs/development/tools/overcommit/Gemfile rename to pkgs/by-name/ov/overcommit/Gemfile diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/by-name/ov/overcommit/Gemfile.lock similarity index 52% rename from pkgs/development/tools/overcommit/Gemfile.lock rename to pkgs/by-name/ov/overcommit/Gemfile.lock index 1c75368b7d81..fbdb66f8a49d 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/by-name/ov/overcommit/Gemfile.lock @@ -1,13 +1,15 @@ GEM remote: https://rubygems.org/ specs: - childprocess (4.1.0) + childprocess (5.1.0) + logger (~> 1.5) iniparse (1.5.0) - overcommit (0.60.0) - childprocess (>= 0.6.3, < 5) + logger (1.6.1) + overcommit (0.64.0) + childprocess (>= 0.6.3, < 6) iniparse (~> 1.4) rexml (~> 3.2) - rexml (3.2.6) + rexml (3.3.7) PLATFORMS ruby @@ -16,4 +18,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 2.4.17 + 2.5.16 diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/by-name/ov/overcommit/gemset.nix similarity index 57% rename from pkgs/development/tools/overcommit/gemset.nix rename to pkgs/by-name/ov/overcommit/gemset.nix index 96e84f288e4f..ed1b0fd5351e 100644 --- a/pkgs/development/tools/overcommit/gemset.nix +++ b/pkgs/by-name/ov/overcommit/gemset.nix @@ -1,13 +1,14 @@ { childprocess = { + dependencies = ["logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs"; type = "gem"; }; - version = "4.1.0"; + version = "5.1.0"; }; iniparse = { groups = ["default"]; @@ -19,25 +20,35 @@ }; version = "1.5.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; overcommit = { dependencies = ["childprocess" "iniparse" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0slqmsycbqx746liwq0qw0c81xrp4051iff8s574a4fmj941gkia"; + sha256 = "0lpl1ppjrqwsmywsb4srfjfm31dna30jrjyx2lkmws7s2jchy94v"; type = "gem"; }; - version = "0.60.0"; + version = "0.64.0"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.7"; }; } diff --git a/pkgs/by-name/ov/overcommit/package.nix b/pkgs/by-name/ov/overcommit/package.nix new file mode 100644 index 000000000000..8100ba20db42 --- /dev/null +++ b/pkgs/by-name/ov/overcommit/package.nix @@ -0,0 +1,42 @@ +{ + lib, + bundlerApp, + bundlerUpdateScript, + git, + makeWrapper, + overcommit, + testers, +}: + +bundlerApp { + pname = "overcommit"; + gemdir = ./.; + exes = [ "overcommit" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/overcommit --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru = { + tests.version = testers.testVersion { + package = overcommit; + version = (import ./gemset.nix).overcommit.version; + }; + updateScript = bundlerUpdateScript "overcommit"; + }; + + meta = with lib; { + description = "Tool to manage and configure Git hooks"; + homepage = "https://github.com/sds/overcommit"; + changelog = "https://github.com/sds/overcommit/blob/main/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "overcommit"; + maintainers = with maintainers; [ + Br1ght0ne + anthonyroussel + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index db943d8ea940..2ea94a1c3428 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/papers"; + changelog = "https://gitlab.gnome.org/GNOME/Incubator/papers/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME's document viewer"; longDescription = '' diff --git a/pkgs/by-name/po/polkit_gnome/package.nix b/pkgs/by-name/po/polkit_gnome/package.nix index 68779415b09e..d738e6c6bb3a 100644 --- a/pkgs/by-name/po/polkit_gnome/package.nix +++ b/pkgs/by-name/po/polkit_gnome/package.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gitlab.gnome.org/Archive/policykit-gnome"; + changelog = "https://gitlab.gnome.org/Archive/policykit-gnome/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Dbus session bus service that is used to bring up authentication dialogs"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix new file mode 100644 index 000000000000..5e6c60aba67a --- /dev/null +++ b/pkgs/by-name/po/postmoogle/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "postmoogle"; + version = "0.9.21"; + + src = fetchFromGitHub { + owner = "etkecc"; + repo = "postmoogle"; + rev = "refs/tags/v${version}"; + hash = "sha256-/AuxrIvxoKb08uf4EOYXorl7vJ99KgEH9DZYLidDzI4="; + }; + + tags = [ + "timetzdata" + "goolm" + ]; + + vendorHash = null; + + postInstall = '' + mv $out/bin/cmd $out/bin/postmoogle + ''; + + meta = with lib; { + description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server"; + homepage = "https://github.com/etkecc/postmoogle"; + changelog = "https://github.com/etkecc/postmoogle/releases/tag/v0.9.21"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ amuckstot30 ]; + mainProgram = "postmoogle"; + }; +} diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix new file mode 100644 index 000000000000..a6508f53badb --- /dev/null +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nixosTests, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "privatebin"; + version = "1.7.4"; + src = fetchFromGitHub { + owner = "PrivateBin"; + repo = "PrivateBin"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-RFP6rhzfBzTmqs4eJXv7LqdniWoeBJpQQ6fLdoGd5Fk="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -R $src/* $out + runHook postInstall + ''; + + passthru.tests = nixosTests.privatebin; + + meta = { + changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}"; + description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data."; + homepage = "https://privatebin.info"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.savyajha ]; + }; +}) diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/by-name/pv/pv-migrate/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/pv-migrate/default.nix rename to pkgs/by-name/pv/pv-migrate/package.nix diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock index 52cccf3e5770..89f9d2e69d9b 100644 --- a/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/pkgs/by-name/py/pylyzer/Cargo.lock @@ -43,9 +43,9 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.1.21" +version = "1.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "shlex", ] @@ -134,7 +134,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.57-nightly.3" +version = "0.1.58-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa300ad75154fdc24c02e66148c5fb15aff48a2cfe8dd18191deb239ba5bcc64" +checksum = "eed2c90d92d8be15be9e928f06d34e0cfe03c8c10e6351326859cecf3789dcac" dependencies = [ "erg_common", "erg_compiler", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.45-nightly.3" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a750b2538983b9a967f1d8af9dddfc23d2a75f1c84ecaeb88e171dcb047c185" +checksum = "4758c25017a49a7f3d8cb3287360deae39c696936a6747cf9e3d9f81cb94c010" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.45-nightly.3" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65b36a8419d694b11effc1e123d9ff16ac50d677950d9b60f47e8bc2429be7b" +checksum = "8c5c7fad1c74774dcbc293b79bb62a024135fcde4faf13411a3490761cb71a98" dependencies = [ "erg_common", "erg_parser", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.45-nightly.3" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec2dd2b5827961fffe7bdbc253a904de0104d0b7677a61faa3c9e47d21aac5e" +checksum = "c564e2914429af720277cb61256362762790da8c635558f77c4d6ae4c3a64f3a" dependencies = [ "erg_common", "erg_proc_macros", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.45-nightly.3" +version = "0.6.46-nightly.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df44f047bae2eae631309bb3f692daaa0a9724eca8e59104cdf57336c55ad45" +checksum = "3fac38f9d18406130093186708186dad6f59efc04b0eddc0a8d0364be9361a90" dependencies = [ "quote", "syn 1.0.109", @@ -264,7 +264,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -290,9 +290,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -464,9 +464,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "parking_lot" @@ -541,6 +544,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -561,7 +570,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.63" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -571,7 +580,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.63" +version = "0.0.64" dependencies = [ "els", "erg_common", @@ -581,7 +590,7 @@ dependencies = [ [[package]] name = "pylyzer_core" -version = "0.0.63" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -592,7 +601,7 @@ dependencies = [ [[package]] name = "pylyzer_wasm" -version = "0.0.63" +version = "0.0.64" dependencies = [ "erg_common", "erg_compiler", @@ -641,9 +650,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -757,7 +766,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -780,7 +789,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -820,9 +829,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -917,9 +926,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -1025,7 +1034,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -1047,7 +1056,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1089,7 +1098,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1100,7 +1109,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1204,5 +1213,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index f28b1de1e3e4..dd6d8de012b0 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -10,19 +10,18 @@ darwin, which, nix-update-script, - testers, - pylyzer, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.63"; + version = "0.0.64"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-nTaU5rfY/Kp2vZLNzFvEtsnpVtcjOC17sXYywZNDvIk="; + hash = "sha256-ShH394FgmuDrArIvz+okVJKWffVVFhsuVWaWFquW2GU="; }; cargoLock = { @@ -63,9 +62,14 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = pylyzer; }; }; meta = { diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix new file mode 100644 index 000000000000..6ccf272f61e2 --- /dev/null +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt5 +}: + +stdenv.mkDerivation rec { + pname = "qmqtt"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "emqx"; + repo = "qmqtt"; + rev = "v${version}"; + hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtbase + ]; + + meta = with lib; { + description = "MQTT client for Qt"; + homepage = "https://github.com/emqx/qmqtt"; + license = licenses.epl10; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 519ad05a7a92..7c04bf6f2e70 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; + changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index f15b9b365a4b..f4b66763daa1 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby_3_2, makeWrapper, nixosTests }: let version = "5.1.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; - inherit ruby; + ruby = ruby_3_2; gemdir = ./.; groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ]; }; diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index b8dfd3ff9c96..d60bedc482cd 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "1.2.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-9aBAksX4h8DlHTl95xd2QvFi3ZV/6i69b68OFa4B1Ew="; + hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk="; }; - cargoHash = "sha256-QyVhEHm1W4kb5b4dngBui3lT7vKBGDS5ZObMWua96KM="; + cargoHash = "sha256-1ZHAbJIWRQh876rshMYeuCz7UMlwdqrScO0eIkGjZao="; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 7b581363ee68..5d54a81b5f2d 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -1,59 +1,20 @@ { lib, - python3, + python3Packages, fetchFromGitHub, dpkg, nix-update-script, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - craft-application = super.craft-application.overridePythonAttrs (old: rec { - version = "1.2.1"; - src = fetchFromGitHub { - owner = "canonical"; - repo = "craft-application"; - rev = "refs/tags/${version}"; - hash = "sha256-CXZEWVoE66dlQJp4G8tinufjyaDJaH1Muxz/qd/81oA="; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" - ''; - preCheck = '' - export HOME=$(mktemp -d) - ''; - }); - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rockcraft"; - version = "1.2.3"; + version = "1.5.3"; src = fetchFromGitHub { owner = "canonical"; repo = "rockcraft"; - rev = "refs/tags/${version}"; - hash = "sha256-Qk7Fi4I/5TCf9llGTsTBQsAxUkeVmAlH6tFNYMsyZ1c="; + rev = "1d87e33cf207b3a2f16eb125743ec11546fa0cb1"; + hash = "sha256-QnW3BMu4Tuvj8PCt5eYJbNMiojXpyJ1uza6hpMxxSOE="; }; postPatch = '' @@ -64,17 +25,19 @@ python.pkgs.buildPythonApplication rec { --replace-fail "distutils.util" "setuptools.dist" ''; - build-system = with python.pkgs; [ setuptools-scm ]; + build-system = with python3Packages; [ setuptools-scm ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ craft-application craft-archives + craft-platforms spdx-lookup ]; nativeCheckInputs = - with python.pkgs; + with python3Packages; [ + craft-platforms pytest-check pytest-mock pytest-subprocess diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 37259f408fd0..dadfc5b6b472 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "serde", ] @@ -879,9 +879,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fern" @@ -994,8 +994,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1114,7 +1114,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -1347,9 +1347,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcst" @@ -1405,9 +1405,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -2084,6 +2084,7 @@ dependencies = [ "hashbrown", "insta", "ordermap", + "red_knot_vendored", "ruff_db", "ruff_index", "ruff_python_ast", @@ -2092,7 +2093,6 @@ dependencies = [ "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", - "ruff_vendored", "rustc-hash 2.0.0", "salsa", "smallvec", @@ -2127,6 +2127,17 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "red_knot_vendored" +version = "0.0.0" +dependencies = [ + "once_cell", + "path-slash", + "ruff_db", + "walkdir", + "zip", +] + [[package]] name = "red_knot_wasm" version = "0.0.0" @@ -2152,11 +2163,11 @@ dependencies = [ "notify", "rayon", "red_knot_python_semantic", + "red_knot_vendored", "ruff_cache", "ruff_db", "ruff_python_ast", "ruff_text_size", - "ruff_vendored", "rustc-hash 2.0.0", "salsa", "tempfile", @@ -2194,14 +2205,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -2215,13 +2226,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -2232,9 +2243,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -2253,7 +2264,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.8" +version = "0.6.9" dependencies = [ "anyhow", "argfile", @@ -2325,6 +2336,7 @@ dependencies = [ "ruff_python_formatter", "ruff_python_parser", "ruff_python_trivia", + "rustc-hash 2.0.0", "serde", "serde_json", "tikv-jemallocator", @@ -2472,7 +2484,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.8" +version = "0.6.9" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2790,20 +2802,9 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "ruff_vendored" -version = "0.0.0" -dependencies = [ - "once_cell", - "path-slash", - "ruff_db", - "walkdir", - "zip", -] - [[package]] name = "ruff_wasm" -version = "0.6.8" +version = "0.6.9" dependencies = [ "console_error_panic_hook", "console_log", @@ -2886,9 +2887,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3245,9 +3246,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3267,9 +3268,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index e1c08aa56074..c760ebd8f336 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -8,19 +8,18 @@ rust-jemalloc-sys, ruff-lsp, nix-update-script, - testers, - ruff, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-guRg35waq6w+P8eaXJFwMtROoXU3d3yURGwzG2SIzhc="; + hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw="; }; cargoLock = { @@ -44,10 +43,11 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/ruff generate-shell-completion zsh) ''; - passthru.tests = { - inherit ruff-lsp; + passthru = { + tests = { + inherit ruff-lsp; + }; updateScript = nix-update-script { }; - version = testers.testVersion { package = ruff; }; }; # Failing on darwin for an unclear reason. @@ -73,6 +73,12 @@ rustPlatform.buildRustPackage rec { "--skip=unix::symlink_inside_workspace" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index dca12dd494fa..a0cf6b55cf22 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = "https://gitlab.gnome.org/GNOME/rygel"; + changelog = "https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix new file mode 100644 index 000000000000..edbe49945f1a --- /dev/null +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -0,0 +1,10 @@ +{ scala, fetchurl }: + +scala.bare.overrideAttrs (oldAttrs: { + version = "3.5.1"; + pname = "scala-next"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-pRfoCXFVnnEh3zyB9HbUZK3qrQ94Gq3iXX2fWGS/l9o="; + }; +}) diff --git a/pkgs/by-name/sc/screego/package.nix b/pkgs/by-name/sc/screego/package.nix index 56783b74febd..4b1b21f3823a 100644 --- a/pkgs/by-name/sc/screego/package.nix +++ b/pkgs/by-name/sc/screego/package.nix @@ -1,6 +1,6 @@ { lib, - buildGoModule, + buildGo123Module, fetchFromGitHub, fetchYarnDeps, yarnConfigHook, @@ -10,13 +10,13 @@ }: let - version = "1.10.5"; + version = "1.11.0"; src = fetchFromGitHub { owner = "screego"; repo = "server"; rev = "v${version}"; - hash = "sha256-4WF9PfG6W1BLBqgWkKhTFEzed0+jDpRFMTsHw/1lPnQ="; + hash = "sha256-PTGIcv+jgX8t37otBypuZG6DaGIeo92+w6YlRynIkZE="; }; ui = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - hash = "sha256-ye8UDkal10k/5uCd0VrZsG2FJGB727q+luExFTUmB/M="; + hash = "sha256-yjHxyKEqXMxYsm+KroPB9KulfqYSOU/7ghbKnlSFrd0="; }; nativeBuildInputs = [ @@ -36,6 +36,10 @@ let nodejs ]; + preConfigure = '' + export HOME=$(mktemp -d) + ''; + installPhase = '' cp -r build $out ''; @@ -44,12 +48,12 @@ let in -buildGoModule rec { +buildGo123Module rec { inherit src version; pname = "screego-server"; - vendorHash = "sha256-ry8LO+KmNU9MKL8/buk9qriDe/zq+2uIsws6wVZmoo4="; + vendorHash = "sha256-190Fp2QtnZis0sophGwhnWhXNWLhODWlnzE3bfScZ+Q="; ldflags = [ "-s" @@ -68,6 +72,8 @@ buildGoModule rec { mv $out/bin/server $out/bin/screego ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Screen sharing for developers"; homepage = "https://screego.net"; diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 52dc9d7bc01e..5529d594ff15 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; + changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index ad2eb1c0b7fc..d8ae5e24b1cb 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -5,37 +5,14 @@ lib, makeWrapper, nix-update-script, - python3, + python3Packages, squashfsTools, stdenv, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { - version = "0.11.2"; - src = fetchFromGitHub { - owner = "NowanIlfideme"; - repo = "pydantic-yaml"; - rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; - }; - dependencies = with self; [ - deprecated - importlib-metadata - pydantic_1 - ruamel-yaml - types-deprecated - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.3.3"; + version = "8.4.1"; pyproject = true; @@ -43,7 +20,7 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; rev = "refs/tags/${version}"; - hash = "sha256-xE+5nYvXawl9HjeBI9ogwyYAVCj/sPoMCVfEeZL5vN4="; + hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c="; }; patches = [ @@ -93,7 +70,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ attrs catkin-pkg click @@ -102,6 +79,7 @@ python.pkgs.buildPythonApplication rec { craft-cli craft-grammar craft-parts + craft-platforms craft-providers craft-store debian @@ -136,7 +114,7 @@ python.pkgs.buildPythonApplication rec { validators ]; - build-system = with python.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ "docutils" @@ -151,7 +129,7 @@ python.pkgs.buildPythonApplication rec { ''; nativeCheckInputs = - with python.pkgs; + with python3Packages; [ pytest-check pytest-cov-stub diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 62db1c422ac4..645af460f681 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.13"; + version = "0.1.15"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; rev = "refs/tags/v${version}"; - hash = "sha256-QtQAcbyTSAj56QZky7eyNS15pnetLVN1Z4cN5pxlJFc="; + hash = "sha256-YglpdxZT5CyFLla6uXTKPtq9EbA9SEQacyR9KNToYT0="; }; npmDeps = fetchNpmDeps { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-CWDwVVea+cdsoIbQdQ3HDiVwYuMSplWZSUXTweibu9s="; + cargoHash = "sha256-piZ+oLL8FqS8Ishi7byYfdedkszreGuxI56pTLcYXn4="; postPatch = '' # Using local tailwindcss for compilation diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/by-name/st/stc-cli/package.nix similarity index 100% rename from pkgs/applications/networking/stc-cli/default.nix rename to pkgs/by-name/st/stc-cli/package.nix diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 9bb594a3751e..d788afe3e88e 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "superfile"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "yorukot"; repo = "superfile"; rev = "v${version}"; - hash = "sha256-ajLlXySf/YLHrwwacV5yIF8qU5pKvEoOwpDoxh49qaU="; + hash = "sha256-/MdcfZpYr7vvPIq0rqLrPRPPU+cyp2y0EyxQPf9znwQ="; }; - vendorHash = "sha256-vybe4KNj6ZhvXRTiN7e5+IhOewfK5L2jKPrcdCYGc4k="; + vendorHash = "sha256-8WGmksKH0rmfRH6Xxd0ACl1FS7YPphG7hsIB5/o38lQ="; ldflags = ["-s" "-w"]; diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index 880fc60887d1..bbcaec75a412 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/sushi"; + changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags"; description = "Quick previewer for Nautilus"; mainProgram = "sushi"; maintainers = teams.gnome.members; diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/by-name/sw/swaykbdd/package.nix similarity index 100% rename from pkgs/tools/wayland/swaykbdd/default.nix rename to pkgs/by-name/sw/swaykbdd/package.nix diff --git a/pkgs/by-name/sw/swell-foop/package.nix b/pkgs/by-name/sw/swell-foop/package.nix index 85d6290e9354..a08d951e55ed 100644 --- a/pkgs/by-name/sw/swell-foop/package.nix +++ b/pkgs/by-name/sw/swell-foop/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/swell-foop"; + changelog = "https://gitlab.gnome.org/GNOME/swell-foop/-/tree/${version}?ref_type=tags"; description = "Puzzle game, previously known as Same GNOME"; mainProgram = "swell-foop"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index 58db1862b349..b84c123862fb 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/tali"; + changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index 2263a889a93c..da454bc57fca 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-+2K+8IGl7c2Nq1wr3pDl4H9MEbPsXZotsyaor5TzD5s="; + hash = "sha256-K8eq3cuPRgVSqd9VVjlE9DQJQKlyUGZKAhPRwpUTrTc="; }; - vendorHash = "sha256-1PgE7Qxxe+GMaMpH5xql/NX8+QSkGRn++/+T6MQkUmM="; + vendorHash = "sha256-X9gQ0mtuIgeo7s/IOAC5k6q3C8rBOKjTdQgeV7d3L60="; ldflags = [ "-s" diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index ace164ad0fc6..72194aebfbac 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.33.2"; + version = "1.33.3"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - hash = "sha256-+HclPZOVBa5cEAuUr5R40+CHI58yZJ6uo8qM06IAgQw="; + hash = "sha256-r13STmaDJz4OGboNPsrJSi668q72Bzffe5TRXJk6pdI="; }; vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY="; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 48d2070a0fbd..43293874ddf6 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.5"; + version = "13.5.6"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-5Gwr7gKI5HVyAymi04BjiKTAIrYSSLVmIBu882XZ7gw="; + hash = "sha256-dEairGoBMsXF4gtnnqa2KsA8PpW9VwF8woUrInVWuKM="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-kpRtPM7jTYm6wmYiFT89B4Ue7kbsWweUxqXzeNtLCdo="; + hash = "sha256-9WRN+iU7vvt9KvVudsS7qe0hoJwDP/J+yOTHW7nmrxs="; }; }; diff --git a/pkgs/by-name/to/tor-browser/update.nix b/pkgs/by-name/to/tor-browser/update.nix index 04b69d8ce208..7faf4c31efbf 100644 --- a/pkgs/by-name/to/tor-browser/update.nix +++ b/pkgs/by-name/to/tor-browser/update.nix @@ -56,7 +56,7 @@ in writeShellScript "update-${pname}" '' for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" - sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) + sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | head -1 | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 9155a0fc1b55..8baa3f884c80 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apps.gnome.org/Totem/"; + changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags"; description = "Movie player for the GNOME desktop based on GStreamer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins diff --git a/pkgs/by-name/ts/tsm-client/package.nix b/pkgs/by-name/ts/tsm-client/package.nix index c133aae1d671..bf65c8d0cadc 100644 --- a/pkgs/by-name/ts/tsm-client/package.nix +++ b/pkgs/by-name/ts/tsm-client/package.nix @@ -45,7 +45,7 @@ # point to this derivations `/dsmi_dir` directory symlink. # Other environment variables might be necessary, # depending on local configuration or usage; see: -# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=solaris-set-api-environment-variables +# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables # The newest version of TSM client should be discoverable by @@ -104,10 +104,10 @@ let unwrapped = stdenv.mkDerivation (finalAttrs: { name = "tsm-client-${finalAttrs.version}-unwrapped"; - version = "8.1.23.0"; + version = "8.1.24.0"; src = fetchurl { url = mkSrcUrl finalAttrs.version; - hash = "sha512-LydzEvzcv7sizSQkVmkbJ/WhunP6oJm32M6nstIfSginCLwYoSb5WbnjeQq2PM2xncFN8W/SteUtCPYbOVKaKA=="; + hash = "sha512-TqTDE2oJK/Wu/MNYUCqxmOE6asAqDLz4GtdcFZuKqvfT8pJUCYKz9yjRPIrM3u2XfLH0wDq+Q8ER4ui680mswA=="; }; inherit meta passthru; diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index d44232121660..6a8fd54173d2 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "7.2.6"; + version = "7.2.7"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-nWeuWlP000DHEmIBzW1UmGqN+BggCjTS5plbQ/NV6wY="; + hash = "sha256-2kbhUg+rNuIUF/Bna6jFLI6Vhg9TlSi+OZEy6jKl2X0="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 703ff4d0600d..532c6cb4e42d 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.08.23"; + version = "2024.09.30"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-cJOy7DG5Ea5cpnHvUiv70FV2ULrevs64Bu5eBJi9BLs="; + hash = "sha256-lPvThSB8xYZQBRKTJmFwoCKBd5lOHaAOttrtcuQDIUg="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix new file mode 100644 index 000000000000..e70565ca4578 --- /dev/null +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + lib, + rustPlatform, + fetchCrate, + pkg-config, + libusb1, + nix-update-script, + testers, + wchisp, +}: + +rustPlatform.buildRustPackage rec { + pname = "wchisp"; + version = "0.3.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0="; + }; + + cargoHash = "sha256-5kJ0MK0rUzyJvLZH/3nje+gTAM6et0mNE3sxVoK1L5s="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libusb1 + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = wchisp; + }; + }; + + meta = with lib; { + description = "A command-line implementation of WCHISPTool, for flashing ch32 MCUs"; + homepage = "https://ch32-rs.github.io/wchisp/"; + changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}"; + license = with licenses; [ gpl2Only ]; + platforms = with platforms; linux ++ darwin ++ windows; + broken = !stdenv.hostPlatform.isLinux; + maintainers = with maintainers; [ jwillikers ]; + mainProgram = "wchisp"; + }; +} diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix index 4bc293001ad5..346d268f4932 100644 --- a/pkgs/by-name/wu/wush/package.nix +++ b/pkgs/by-name/wu/wush/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.2.1"; + version = "0.3.0"; in buildGoModule { pname = "wush"; @@ -14,10 +14,10 @@ buildGoModule { owner = "coder"; repo = "wush"; rev = "v${version}"; - hash = "sha256-kxynXymCz3cLEeeINT72Xl8TOEAFyB4Z3y5WNtARnSI="; + hash = "sha256-2mFe1p15HRyy86pw5LoBtiW9lKrw/N9V81/jkiT4jo4="; }; - vendorHash = "sha256-g3QqXII9nI5+wBa2YyTajz15Bx1F5/6PV9oNlbcZbe4="; + vendorHash = "sha256-Po1DDKP9ekScRDGMjCXZr9HUUwFenQx3bzIZrNI+ctY="; ldflags = [ "-s -w -X main.version=${version}" diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index de0b48feaf04..b19a711ae7eb 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -15,18 +15,13 @@ stdenv.mkDerivation (finalAttrs: { name = "xmoji"; - version = "0.5.1"; + version = "0.8"; src = fetchFromGitHub { owner = "Zirias"; repo = "xmoji"; - rev = - let - inherit (lib.versions) majorMinor patch; - inherit (finalAttrs) version; - in - "refs/tags/v${majorMinor version}-${patch version}"; - hash = "sha256-ZZ1jW97JUv003bAMZZfGWbAAPgeZlpBKREaedFi3R8M="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-uYynbzexj1MDHcU8tryJLCGmqTfYOmY0vXrHZ3MlZa0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/by-name/yo/yor/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/yor/default.nix rename to pkgs/by-name/yo/yor/package.nix diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 4a6c1a59fed4..aa23342eebc2 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "zenity"; description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://gitlab.gnome.org/GNOME/zenity"; + changelog = "https://gitlab.gnome.org/GNOME/zenity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index 801c0d384445..35714e8d3c0e 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/zile/"; + changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}"; description = "Zile Implements Lua Editors"; longDescription = '' GNU Zile is a text editor development kit, so that you can (relatively) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 901659b0e77b..e7a79ac3f760 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -200,6 +200,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zoom.us/"; + changelog = "https://support.zoom.com/hc/en/article?id=zm_kb&sysparm_article=KB0061222"; description = "zoom.us video conferencing application"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/by-name/zo/zotify/package.nix b/pkgs/by-name/zo/zotify/package.nix index c6704ab2e53a..5e82bff79695 100644 --- a/pkgs/by-name/zo/zotify/package.nix +++ b/pkgs/by-name/zo/zotify/package.nix @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast and customizable music and podcast downloader"; homepage = "https://github.com/zotify-dev/zotify"; + changelog = "https://github.com/zotify-dev/zotify/blob/main/CHANGELOG.md"; license = lib.licenses.zlib; mainProgram = "zotify"; maintainers = with lib.maintainers; [ bwkam ]; diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 83908cd7a01a..1ade403a1187 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/fcorbelli/zpaqfranz"; + changelog = "https://github.com/fcorbelli/zpaqfranz/releases/tag/${finalAttrs.version}"; description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests"; mainProgram = "zpaqfranz"; license = with lib.licenses; [ mit ]; diff --git a/pkgs/by-name/zu/zunit/package.nix b/pkgs/by-name/zu/zunit/package.nix index 72e117a71ac0..501aad737c02 100644 --- a/pkgs/by-name/zu/zunit/package.nix +++ b/pkgs/by-name/zu/zunit/package.nix @@ -87,6 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Powerful testing framework for ZSH projects"; homepage = "https://zunit.xyz/"; downloadPage = "https://github.com/zunit-zsh/zunit/releases"; + changelog = "https://github.com/zunit-zsh/zunit/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "zunit"; inherit (zsh.meta) platforms; diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix index cd5d10551192..affac873f2cd 100644 --- a/pkgs/by-name/zx/zxing-cpp/package.nix +++ b/pkgs/by-name/zx/zxing-cpp/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/zxing-cpp/zxing-cpp"; + changelog = "https://github.com/zxing-cpp/zxing-cpp/releases/tag/${finalAttrs.src.rev}"; description = "C++ port of zxing (a Java barcode image processing library)"; longDescription = '' ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix index 1735a6523b0b..650a220250cb 100644 --- a/pkgs/by-name/zx/zxpy/package.nix +++ b/pkgs/by-name/zx/zxpy/package.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Shell scripts made simple"; homepage = "https://github.com/tusharsadhwani/zxpy"; + changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "zxpy"; diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix index 16379f63c9b2..610989ce9f2e 100644 --- a/pkgs/by-name/zy/zydis/package.nix +++ b/pkgs/by-name/zy/zydis/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zydis.re/"; + changelog = "https://github.com/zyantific/zydis/releases/tag/v${version}"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix index cae01170f290..154a8f2a9e37 100644 --- a/pkgs/by-name/zz/zziplib/package.nix +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/gdraheim/zziplib"; + changelog = "https://github.com/gdraheim/zziplib/blob/${version}/ChangeLog"; description = "Library to extract data from files archived in a zip file"; longDescription = '' The zziplib library is intentionally lightweight, it offers the ability to diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index a6e65ce68955..20f071050dff 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; - version = "14.0.2"; + version = "15.0.3"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-aCbiHqCNxd8myIeuTlYEaYfg9JCd+MAsc94FcUoDU8E="; + sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho="; }; dontBuild = true; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 816bb25b1be4..4decc3c6dd99 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mobile broadband service provider database"; homepage = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"; + changelog = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.publicDomain; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch b/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch deleted file mode 100644 index dfa90b18ca09..000000000000 --- a/pkgs/desktops/lomiri/development/libusermetrics/2001-Remove-custom-check-target.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 52ac1d6548b4a92d569c5d2f53b84c604c7fce8a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 1 Feb 2024 22:42:39 +0100 -Subject: [PATCH] Remove custom check target - -The automatic one provides better controls for us ---- - CMakeLists.txt | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af643a7..75b3cc1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,18 +105,13 @@ add_subdirectory("data") - - - if(ENABLE_TESTS) --enable_testing() -+include(CTest) - - pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED) - include_directories(${QTDBUSTEST_INCLUDE_DIRS}) - - add_subdirectory(tests) - --ADD_CUSTOM_TARGET( -- check -- ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure --) -- - find_package(CoverageReport) - enable_coverage_report( - TARGETS --- -2.42.0 - diff --git a/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch b/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch deleted file mode 100644 index 82961cd4ba79..000000000000 --- a/pkgs/desktops/lomiri/development/libusermetrics/2002-Launch-module-created-systemd-service.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cf8ba54d22f5ac839004c0d984fb402bde82b527 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 8 Apr 2024 15:22:55 +0200 -Subject: [PATCH] Launch module-created systemd service - ---- - data/com.lomiri.UserMetrics.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/com.lomiri.UserMetrics.service.in b/data/com.lomiri.UserMetrics.service.in -index c2e6ae1..212e24f 100644 ---- a/data/com.lomiri.UserMetrics.service.in -+++ b/data/com.lomiri.UserMetrics.service.in -@@ -3,3 +3,4 @@ Name=com.lomiri.UserMetrics - Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/libusermetrics/usermetricsservice - User=usermetrics - StandardOutput=syslog -+SystemdService=dbus-com.lomiri.UserMetrics.service --- -2.42.0 - diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 9058e1af264b..68232367a351 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -13,13 +13,13 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-bGMtrdwjlTxEQdsasOvVuI+mRzir/tnENCIfy1/6JMM="; + hash = "sha256-hFLiE1S9l2NhSIaqpYoBfn27IkhavcM0Ma31+XJtYj4="; }; postPatch = '' diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index b7bd676143c0..c1bf6347947c 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -1,16 +1,23 @@ -{ fetchFromGitHub -, gradle_7 -, jdk11 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + gradle_7, + jdk11, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk11; gradle = gradle_7; extraConfig = [ @@ -19,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.23.9.1"; + version = "11.0.24.8.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI="; + sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index c557012e8cdb..90ca350a355d 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -1,34 +1,43 @@ -{ fetchFromGitHub -, fetchurl -, gradle_7 -, jdk17 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + fetchurl, + gradle_7, + jdk17, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk17; gradle = gradle_7; - version = "17.0.11.9.1"; + version = "17.0.12.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0="; + sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; }; }; in -corretto.overrideAttrs (final: prev: { - # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply. - patches = lib.remove - (fetchurl { +corretto.overrideAttrs ( + final: prev: { + # Corretto17 has incorporated this patch already so it fails to apply. + # We thus skip it here. + # See https://github.com/corretto/corretto-17/pull/158 + patches = lib.remove (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - (prev.patches or [ ]); -}) + }) (prev.patches or [ ]); + } +) diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index 9656ace73cef..a5ab64d02c24 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -1,25 +1,32 @@ -{ corretto21 -, fetchFromGitHub -, gradle_7 -, jdk21 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + corretto21, + fetchFromGitHub, + gradle_7, + jdk21, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk21; gradle = gradle_7; - version = "21.0.3.9.1"; + version = "21.0.4.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 37ac9006515d..0de05fb0f6c8 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -1,13 +1,14 @@ -{ jdk -, version -, src -, lib -, stdenv -, gradle -, extraConfig ? [ ] -, rsync -, runCommand -, testers +{ + jdk, + version, + src, + lib, + stdenv, + gradle, + extraConfig ? [ ], + rsync, + runCommand, + testers, }: # Each Corretto version is based on a corresponding OpenJDK version. So @@ -19,97 +20,111 @@ let pname = "corretto"; - # The version scheme is different between OpenJDK & Corretto. - # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 - # "major.minor.security.build.revision" in -jdk.overrideAttrs (finalAttrs: oldAttrs: { - inherit pname version src; - name = "${pname}-${version}"; +# The version scheme is different between OpenJDK & Corretto. +# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 +# "major.minor.security.build.revision" +jdk.overrideAttrs ( + finalAttrs: oldAttrs: { + inherit pname version src; + name = "${pname}-${version}"; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ + jdk + gradle + rsync + ]; - dontConfigure = true; + dontConfigure = true; - postPatch = let - extra_config = builtins.concatStringsSep " " extraConfig; - in '' - # The rpm/deb task definitions require a Gradle plugin which we don't - # have and so the build fails. We'll simply remove them here because - # they are not needed anyways. - rm -rf installers/linux/universal/{rpm,deb} + postPatch = + let + extra_config = builtins.concatStringsSep " " extraConfig; + in + '' + # The rpm/deb task definitions require a Gradle plugin which we don't + # have and so the build fails. We'll simply remove them here because + # they are not needed anyways. + rm -rf installers/linux/universal/{rpm,deb} - # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" - done + # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" + done - gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") - ''; + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") + ''; - # since we dontConfigure, we must run this manually - preBuild = "gradleConfigureHook"; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - gradleBuildTask = - if stdenv.hostPlatform.isDarwin then - ":installers:mac:tar:build" - else ":installers:linux:universal:tar:packageBuildResults"; + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.hostPlatform.isDarwin then + ":installers:mac:tar:build" + else + ":installers:linux:universal:tar:packageBuildResults"; - postBuild = '' - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk - '' + oldAttrs.postBuild or ""; + postBuild = + '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + + oldAttrs.postBuild or ""; - installPhase = oldAttrs.installPhase + '' - # The installPhase will place everything in $out/lib/openjdk and - # reference through symlinks. We don't rewrite the installPhase but at - # least move the folder to convey that this is not OpenJDK anymore. - mv $out/lib/openjdk $out/lib/corretto - ln -s $out/lib/corretto $out/lib/openjdk - ''; + installPhase = + oldAttrs.installPhase + + '' + # The installPhase will place everything in $out/lib/openjdk and + # reference through symlinks. We don't rewrite the installPhase but at + # least move the folder to convey that this is not OpenJDK anymore. + mv $out/lib/openjdk $out/lib/corretto + ln -s $out/lib/corretto $out/lib/openjdk + ''; - passthru = - let - pkg = finalAttrs.finalPackage; - in - oldAttrs.passthru // { - tests = { - version = testers.testVersion { - package = pkg; + passthru = + let + pkg = finalAttrs.finalPackage; + in + oldAttrs.passthru + // { + tests = { + version = testers.testVersion { package = pkg; }; + vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' + output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) + grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out + ''; + compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' + cat << EOF > Main.java + class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } + } + EOF + ${pkg}/bin/javac Main.java + ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out + ''; }; - vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' - output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) - grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out - ''; - compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' - cat << EOF > Main.java - class Main { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } - } - EOF - ${pkg}/bin/javac Main.java - ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out - ''; }; - }; - - # Some of the OpenJDK derivation set their `pos` by hand. We need to - # overwrite this in order to point to Corretto, not OpenJDK. - pos = __curPos; - meta = with lib; oldAttrs.meta // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; -}) + # Some of the OpenJDK derivation set their `pos` by hand. We need to + # overwrite this in order to point to Corretto, not OpenJDK. + pos = __curPos; + meta = + with lib; + oldAttrs.meta + // { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with maintainers; [ rollf ]; + }; + } +) diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix deleted file mode 100644 index a4cb04351031..000000000000 --- a/pkgs/development/compilers/go/1.21.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, substituteAll -, iana-etc -, Security -, Foundation -, xcbuild -, mailcap -, buildPackages -, pkgsBuildTarget -, threadsCross -, testers -, skopeo -, buildGo121Module -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; - - skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "go"; - version = "1.21.13"; - - src = fetchurl { - url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00="; - }; - - strictDeps = true; - buildInputs = [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - - postPatch = '' - patchShebangs . - ''; - - patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; - iana = iana-etc; - }) - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; - inherit mailcap; - }) - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; - inherit tzdata; - }) - ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.21.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - buildPhase = '' - runHook preBuild - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - - pushd src - ./make.bash - popd - runHook postBuild - ''; - - preInstall = '' - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} - ''} - ''); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap skopeoTest; - tests = { - skopeo = testers.testVersion { package = skopeoTest; }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "go version"; - version = "go${finalAttrs.version}"; - }; - }; - }; - - meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; - description = "Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd; - mainProgram = "go"; - }; -}) diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch deleted file mode 100644 index 1adbf46398c5..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index ffc79bb93f..2d0311975d 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) { - readVendorList(MainModules.mustGetSingleMainModule()) - - pre114 := false -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index bbbb573f2f5a..684537e160c7 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, + ncurses, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.3.3"; pname = "scala-bare"; src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; + url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz"; hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE="; }; - propagatedBuildInputs = [ jre ncurses.dev ] ; + propagatedBuildInputs = [ + jre + ncurses.dev + ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -20,23 +30,24 @@ stdenv.mkDerivation rec { # Use preFixup instead of fixupPhase # because we want the default fixupPhase as well preFixup = '' - bin_files=$(find $out/bin -type f ! -name common) - for f in $bin_files ; do - wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' - done + bin_files=$(find $out/bin -type f ! -name "*common*" ! -name "scala-cli.jar") + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' + done ''; meta = with lib; { - description = "Research platform for new language concepts and compiler technologies for Scala"; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = "http://dotty.epfl.ch/"; - license = licenses.bsd3; + description = "The Scala 3 compiler, also known as Dotty"; + homepage = "https://scala-lang.org/"; + license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ karolchmist virusdave kashw2 ]; + maintainers = with maintainers; [ + karolchmist + virusdave + kashw2 + natsukagami + hamzaremmal + dottybot + ]; }; -} +}) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 2ad68ffec3b3..8d27707dff7f 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,8 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: +{ + stdenv, + fetchurl, + makeWrapper, + jre, + callPackage, +}: let bare = callPackage ./bare.nix { - inherit stdenv fetchurl makeWrapper jre; + inherit + stdenv + fetchurl + makeWrapper + jre + ; }; in @@ -21,4 +32,7 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} // { inherit bare; } +} +// { + inherit bare; +} diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 28a08f0039f7..a8edc6931a3d 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -29,7 +29,7 @@ compcert = mkCoqDerivation { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.19"; out = "3.14"; } + { case = range "8.14" "8.20"; out = "3.14"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -201,13 +201,18 @@ patched_compcert = compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.19") (isEq "3.14") ]; + { cases = [ (range "8.19" "8.20") (isEq "3.14") ]; out = [ # Support for Coq 8.19.2 (fetchpatch { url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; }) + # Support for Coq 8.20.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch"; + hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso="; + }) ]; } ] []; diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 524e00dc5a76..2924c5cf585c 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index c9ddffbff227..7ee51d55bccf 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { ninja ]; - buildInputs = [ ]; - mesonFlags = [ # install validators to $dev "--bindir=${placeholder "dev"}/bin" diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 389ce72a6846..eda770f7e090 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with lib; { description = "Configuration parser library"; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index db62a88d7868..1cd4a0a748f6 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FNA-XNA/FAudio"; changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}"; license = licenses.zlib; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.marius851000 ]; }; } diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 5c2255a50a62..d52ca4fca284 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpg-error gettext ]; - nativeBuildInputs = [ ]; - meta = with lib; { homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 80b418e3065d..8b24f4250b5c 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/IIzUMms4aS63psyxwL+Ynj78c38R3WwbD2HIpdHF88="; + sha256 = "sha256-Ol/vWaXcbDcy+d8V//fK4SYUpnYmwuYJxkO3/+kqgdM="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 83bb0708110b..6a9f3d4a50a7 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; meta = with lib; { description = "C library for manipulating POSIX tar files"; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 128d7391fc4a..31e76793ec01 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -4,7 +4,7 @@ , enableQt ? enableQT , enableXM ? false , libGLX -, enableOpenGLX11 ? !libGLX.meta.broken +, enableOpenGLX11 ? !stdenv.isDarwin , enablePython ? false , enableRaytracerX11 ? false diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 8d0a0e2177fa..c83e41be2af8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -4,7 +4,6 @@ qtModule { pname = "qtgamepad"; propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optional stdenv.hostPlatform.isDarwin GameController; - buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/development/libraries/sokol/default.nix index b84f42490e33..bfb034cfce6c 100644 --- a/pkgs/development/libraries/sokol/default.nix +++ b/pkgs/development/libraries/sokol/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "sokol"; - version = "unstable-2023-08-04"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "floooh"; repo = "sokol"; - rev = "47d92ff86298fc96b3b84d93d0ee8c8533d3a2d2"; - sha256 = "sha256-TsM5wK9a2ectrAY8VnrMPaxCNV3e1yW92SBBCHgs+0k="; + rev = "38e4c9a516f8808d706343a5c525acfe7007fe67"; + sha256 = "sha256-g4JMCbG9is7uBFv6cTBTCmRYfKWMruagtYQjYZnOFn4="; }; dontBuild = true; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index abd87c03b1a8..b61179275506 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "24.05"; + version = "24.09"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - hash = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; + hash = "sha256-27mbIycenOk51PLQrAfU1cZcjiWddNtxoyC6Q9wxqFg="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 232ae01abbfd..8094ed169fa3 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -42,7 +42,6 @@ tcl.mkTclDerivation { ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; propagatedBuildInputs = [ libXft diff --git a/pkgs/development/libraries/x265/fix-clang-asm.patch b/pkgs/development/libraries/x265/fix-clang-asm.patch deleted file mode 100644 index 6aa5fe2f0a0e..000000000000 --- a/pkgs/development/libraries/x265/fix-clang-asm.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a407271b4..593628e0f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -310,7 +310,7 @@ if(GCC) - endif() - check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) - if (CC_HAS_STACK_REALIGN) -- add_definitions(-mstackrealign) -+ add_compile_options($<$:-mstackrealign>) - endif() - # Disable exceptions. Reduce executable size, increase compability. - check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG) -@@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) - list(APPEND ASM_OBJS ${ASM}.${SUFFIX}) - add_custom_command( - OUTPUT ${ASM}.${SUFFIX} -- COMMAND ${CMAKE_CXX_COMPILER} -+ COMMAND ${CMAKE_ASM_COMPILER} - ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX} - DEPENDS ${ASM_SRC}) - endforeach() -diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt -index 12b643ad5..876f3543d 100644 ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -16,6 +16,7 @@ endif(EXTRA_LIB) - if(ENABLE_ASSEMBLY) - set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1) - list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1") -+ enable_language(ASM) - endif(ENABLE_ASSEMBLY) - - if(ENABLE_ASSEMBLY AND X86) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index a1d01682f22e..db06dc756248 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -11,7 +11,6 @@ , glib , wrapGAppsHook3 , gsettings-desktop-schemas -, buildPortalsInGnome ? true }: stdenv.mkDerivation (finalAttrs: { @@ -36,19 +35,11 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 xdg-desktop-portal - ] ++ lib.optionals buildPortalsInGnome [ gsettings-desktop-schemas # settings exposed by settings portal gnome-desktop gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings) ]; - mesonFlags = lib.optionals (!buildPortalsInGnome) [ - "-Dwallpaper=disabled" - "-Dsettings=disabled" - "-Dappchooser=disabled" - "-Dlockdown=disabled" - ]; - meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 0d856a44878b..10bc020a34a4 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C runtime library for AVR microcontrollers"; homepage = "https://github.com/avrdudes/avr-libc"; + changelog = "https://github.com/avrdudes/avr-libc/blob/avr-libc-${finalAttrs.tag_version}-release/NEWS"; license = licenses.bsd3; platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner emilytrau ]; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 382ce87a3eba..74da4320deb5 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -33,6 +33,7 @@ buildGoModule rec { description = "Connect your laptop to cloud computers"; mainProgram = "brev"; homepage = "https://github.com/brevdev/brev-cli"; + changelog = "https://github.com/brevdev/brev-cli/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index f0c54f1dca20..cbb5411314f0 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "juceaide"; longDescription = "JUCE is an open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, RTAS and AAX audio plug-ins"; homepage = "https://github.com/juce-framework/JUCE"; + changelog = "https://github.com/juce-framework/JUCE/blob/${finalAttrs.version}/CHANGE_LIST.md"; license = with licenses; [ isc gpl3Plus ]; maintainers = with maintainers; [ kashw2 ]; platforms = platforms.all; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 113bf9e76da5..1d2324ddf177 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -15,6 +15,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/cgag/loc"; + changelog = "https://github.com/cgag/loc/blob/v${version}/CHANGELOG.md"; description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 9b2d0ad78100..9fb98de3a248 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -66,6 +66,7 @@ in python27.pkgs.buildPythonApplication { meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; + changelog = "https://github.com/abathur/resholve/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ abathur ]; platforms = platforms.all; diff --git a/pkgs/development/misc/rpiboot/default.nix b/pkgs/development/misc/rpiboot/default.nix index 69ea80db109f..53b8c0326b1b 100644 --- a/pkgs/development/misc/rpiboot/default.nix +++ b/pkgs/development/misc/rpiboot/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/raspberrypi/usbboot"; + changelog = "https://github.com/raspberrypi/usbboot/blob/${version}/debian/changelog"; description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; mainProgram = "rpiboot"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index c3a4ec04b50c..675657c7be25 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.9.1"; + version = "2024.9.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-MdsK+QP8YdMceTiNwhuf84KARIHCyn7/g6WKrDB6yCc="; + hash = "sha256-2jPQcMD05SUYnBwAaWHbGKXy7Du2JKPVq3eui9YaqxI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiodukeenergy/default.nix b/pkgs/development/python-modules/aiodukeenergy/default.nix new file mode 100644 index 000000000000..01e0fa7cae1a --- /dev/null +++ b/pkgs/development/python-modules/aiodukeenergy/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + yarl, +}: + +buildPythonPackage rec { + pname = "aiodukeenergy"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hunterjm"; + repo = "aiodukeenergy"; + rev = "refs/tags/v${version}"; + hash = "sha256-aDBleEp3ZlY1IfFCbsUEU+wzYgjNaJeip8crHlh5qHE="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "aiodukeenergy" ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/hunterjm/aiodukeenergy/blob/${src.rev}/CHANGELOG.md"; + description = "Asyncio Duke Energy"; + homepage = "https://github.com/hunterjm/aiodukeenergy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 8e13ca9d212b..4d6f597fb2a9 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "25.3.2"; + version = "27.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-ITNXPwQTKOyH0TXYr8v/VI5rPNCvKGb/zIE1q+Ja8j0="; + hash = "sha256-2FA0QleMJG69vhyC85tO4ZAY0U8qPIdyJROHKxC35GM="; }; build-system = [ diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index 7c0f045c6222..6e702e7927cb 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiorussound"; - version = "3.1.5"; + version = "4.0.5"; pyproject = true; # requires newer f-strings introduced in 3.12 @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-c9elemUdvX8Q8/Sr4DSXEx9SdRoLKibQFbY+WSDg/yM="; + hash = "sha256-W0vhVK1SmnTsNuXpDn2e1BrBnsdBwgiNyXucC+ASg1M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/apeye-core/default.nix b/pkgs/development/python-modules/apeye-core/default.nix index 3a6d8cbec834..d86560254517 100644 --- a/pkgs/development/python-modules/apeye-core/default.nix +++ b/pkgs/development/python-modules/apeye-core/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { idna ]; - nativeCheckInputs = [ ]; - meta = { description = "Core (offline) functionality for the apeye library."; homepage = "https://github.com/domdfcoding/apyey-core"; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 8b091fc6dfe7..e72e6baa6247 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { pname = "awslambdaric"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; disabled = isPy27; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-FHZ7ZTCOzElW/DM07TScp6bfOOFe4b307q/ALVX1fWQ="; + sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU="; }; propagatedBuildInputs = [ simplejson ]; diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index de43b8c642ac..3e2819fa0fea 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.3.1"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-WfaDTKht+WEnozVFWGYwNvrC8Rr/IePxjNp5O7jz/9A="; + hash = "sha256-SAfDpABOWsic3kqsN0txlchEIRKJ0xtpJERZUH5CKR0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 5e76268d7cf4..cec5c8b4a4ad 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VUv9n+GePixsJ2Bqy4YOJpHEVkOjEO1HkBK+jxmkZpA="; + hash = "sha256-i0dJ7UO7HZ9bWhWtWBZ5OwloRBUiZgUKRXab4sm2w/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock new file mode 100644 index 000000000000..7b8ef04d66e1 --- /dev/null +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -0,0 +1,412 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "blake3" +version = "0.4.1" +dependencies = [ + "blake3 1.5.4", + "hex", + "pyo3", + "rayon", +] + +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "memmap2", + "rayon-core", +] + +[[package]] +name = "cc" +version = "1.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix new file mode 100644 index 000000000000..c59998b8fb96 --- /dev/null +++ b/pkgs/development/python-modules/blake3/default.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + libiconv, + numpy, + pytestCheckHook, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "blake3"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "blake3-py"; + rev = "refs/tags/${version}"; + hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8="; + }; + + postPatch = '' + ln -s '${./Cargo.lock}' Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + pythonImportsCheck = [ "blake3" ]; + + meta = { + description = "Python bindings for the BLAKE3 cryptographic hash function"; + homepage = "https://github.com/oconnor663/blake3-py"; + changelog = "https://github.com/oconnor663/blake3-py/releases/tag/${version}"; + license = with lib.licenses; [ + cc0 + asl20 + ]; + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index e6b79fb3bcdd..84ad97686b48 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "brother"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "brother"; rev = "refs/tags/${version}"; - hash = "sha256-JnIJgR8OiN6y6ib0Y+FXa98Q/4dtvJ8q2r6tgQSRvN4="; + hash = "sha256-fWa5FNBGV8tnJ3CozMicXLGsDvnTjNzU8PdV266MeeQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index d36b620710bf..de17cb4106b4 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cached-ipaddress"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "cached-ipaddress"; rev = "refs/tags/v${version}"; - hash = "sha256-Ec2tW1X0iYdQFd5XFRABwUTPjqxV5lhwT6UEimmF+/o="; + hash = "sha256-wF5GBQCmKHo3sX4lYA9/wS69x4fFNNh08VG3qMp9UKs="; }; build-system = [ diff --git a/pkgs/development/python-modules/consolekit/default.nix b/pkgs/development/python-modules/consolekit/default.nix index 45f3caf7d22a..3da148baf4df 100644 --- a/pkgs/development/python-modules/consolekit/default.nix +++ b/pkgs/development/python-modules/consolekit/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - meta = { description = "Additional utilities for click."; homepage = "https://pypi.org/project/consolekit"; diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 96bec81c9172..31f40e64ff90 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -10,12 +10,13 @@ fetchFromGitHub, git, hypothesis, + license-expression, nix-update-script, - pydantic-yaml, pyfakefs, pygit2, pytest-check, pytest-mock, + pytest-subprocess, pytestCheckHook, pythonOlder, pyyaml, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "3.2.0"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,12 +36,12 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-2JfCe7FJtuObC/4miA+OC/ctGy1fhdgI7DsowNYjQk8="; + hash = "sha256-Z9jiIVPh/DozFHoE478VQWinpohOOQplkxFP2ZyAySE="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==70.1.0" "setuptools" + --replace-fail "setuptools==74.1.1" "setuptools" ''; build-system = [ setuptools-scm ]; @@ -56,7 +57,7 @@ buildPythonPackage rec { craft-grammar craft-parts craft-providers - pydantic-yaml + license-expression pygit2 pyyaml snap-helpers @@ -68,6 +69,7 @@ buildPythonPackage rec { pyfakefs pytest-check pytest-mock + pytest-subprocess pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 6369acc78208..f401b5fb5294 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -6,7 +6,7 @@ launchpadlib, lazr-restfulclient, overrides, - pydantic_1, + pydantic, setuptools, setuptools-scm, tabulate, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE="; + hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==67.7.2" "setuptools" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ launchpadlib lazr-restfulclient overrides - pydantic_1 + pydantic tabulate ]; diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 6b920aaa7a4a..1aeb3c32e10e 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -4,15 +4,15 @@ fetchFromGitHub, nix-update-script, overrides, - setuptools, + setuptools-scm, pytestCheckHook, - pydantic_1, + pydantic, pyyaml, }: buildPythonPackage rec { pname = "craft-grammar"; - version = "1.2.0"; + version = "2.0.1"; pyproject = true; @@ -20,17 +20,17 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-grammar"; rev = "refs/tags/${version}"; - hash = "sha256-YQpxgdmUxYLkhAXDLlkLAK6VpjIEycLFY3nsE/M4o2g="; + hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ overrides ]; + dependencies = [ overrides ]; pythonImportsCheck = [ "craft_grammar" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytestCheckHook pyyaml ]; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index c3fd4e2abb54..bdd97d35643e 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -4,8 +4,7 @@ fetchFromGitHub, nix-update-script, overrides, - pydantic_1, - pydantic-yaml, + pydantic, pyxdg, pyyaml, requests, @@ -17,6 +16,7 @@ pytest-subprocess, requests-mock, hypothesis, + jsonschema, git, squashfsTools, setuptools-scm, @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "1.33.0"; + version = "2.1.1"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-SP2mkaXsU0btnA3aanSA18GkdW6ReLgImOWdpnwZiyU="; + hash = "sha256-I98YQDJJroCnAQgepDXqYnH5M2WZTGDljm/KufGd7yM="; }; patches = [ ./bash-path.patch ]; @@ -43,12 +43,12 @@ buildPythonPackage rec { pythonRelaxDeps = [ "requests" "urllib3" + "pydantic" ]; dependencies = [ overrides - pydantic_1 - pydantic-yaml + pydantic pyxdg pyyaml requests @@ -61,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git hypothesis + jsonschema pytest-check pytest-mock pytest-subprocess @@ -105,7 +106,6 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { - broken = lib.versionAtLeast pydantic-yaml.version "1"; description = "Software artifact parts builder from Canonical"; homepage = "https://github.com/canonical/craft-parts"; changelog = "https://github.com/canonical/craft-parts/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index f183449961d3..6a1a4936092a 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -5,16 +5,16 @@ distro, fetchFromGitHub, nix-update-script, + hypothesis, pytest-check, pytestCheckHook, pythonOlder, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "craft-platforms"; - version = "0.2.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,17 +23,14 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; rev = "refs/tags/${version}"; - hash = "sha256-chCPuncy+//Y5iohTh0d8qRNaEno6Sqze2Zoas3uwPQ="; + hash = "sha256-VDSwvBWoGHcjGCEA4RDVwRzQGNVaphwZu/iaktAweb0="; }; postPatch = '' substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}" ''; - build-system = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ annotated-types @@ -41,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + hypothesis pytestCheckHook pytest-check ]; diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8b91b0005ed5..7dcf2fff8b52 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -5,10 +5,9 @@ nix-update-script, packaging, platformdirs, - pydantic_1, + pydantic, pyyaml, requests-unixsocket, - setuptools, setuptools-scm, urllib3, pytest-check, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.24.2"; + version = "2.0.3"; pyproject = true; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-2629Xk2KB1WX3JzAupBWmKg+Ztp5FFJ0x9Xa/w+8tns="; + hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk="; }; patches = [ @@ -52,21 +51,18 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==73.0.1" "setuptools" \ --replace-fail "urllib3<2" "urllib3" ''; pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ packaging platformdirs - pydantic_1 + pydantic pyyaml requests-unixsocket urllib3 diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 4011b01d60d0..f9f8f73e8eb0 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -7,7 +7,7 @@ setuptools-scm, pytest-check, pytest-mock, - pydantic_1, + pydantic, pyyaml, pytestCheckHook, keyring_24, @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "2.6.2"; + version = "3.0.2"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; rev = "refs/tags/${version}"; - hash = "sha256-QKfXOgAWMV1mVm32ZP3HQTJmWKm82dEDmy3fo5d67TU="; + hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA="; }; postPatch = '' @@ -36,16 +36,13 @@ buildPythonPackage rec { --replace-fail "setuptools==" "setuptools>=" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ keyring_24 macaroonbakery overrides - pydantic_1 + pydantic pyxdg requests requests-toolbelt @@ -56,7 +53,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "craft_store" ]; nativeCheckInputs = [ - pydantic_1 + pydantic pytest-check pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/deprecation-alias/default.nix b/pkgs/development/python-modules/deprecation-alias/default.nix index da60ac253a23..0d97bb0b4413 100644 --- a/pkgs/development/python-modules/deprecation-alias/default.nix +++ b/pkgs/development/python-modules/deprecation-alias/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/dist-meta/default.nix b/pkgs/development/python-modules/dist-meta/default.nix index 6b7520440a3d..a6d6119429c5 100644 --- a/pkgs/development/python-modules/dist-meta/default.nix +++ b/pkgs/development/python-modules/dist-meta/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 567b79ab9bd7..9e324474291d 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -30,16 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.22"; + version = "1.0.23"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw="; + hash = "sha256-eSvER3lceAEZZ+DhCjvjNW3YpdzCeP/lly5AP3eDnbA="; }; build-system = [ diff --git a/pkgs/development/python-modules/dom-toml/default.nix b/pkgs/development/python-modules/dom-toml/default.nix index 36dafc9a86cc..99ff069ce49f 100644 --- a/pkgs/development/python-modules/dom-toml/default.nix +++ b/pkgs/development/python-modules/dom-toml/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ ]; - meta = { description = "Dom's tools for Tom's Obvious, Minimal Language."; homepage = "https://github.com/domdfcoding/dom_toml"; diff --git a/pkgs/development/python-modules/domdf-python-tools/default.nix b/pkgs/development/python-modules/domdf-python-tools/default.nix index bf73369c19c3..832674256a0e 100644 --- a/pkgs/development/python-modules/domdf-python-tools/default.nix +++ b/pkgs/development/python-modules/domdf-python-tools/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix index 9ec1dc51addf..d1b61186195e 100644 --- a/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic testsuite framework in Python"; - changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; homepage = "https://github.com/AdaCore/e3-testsuite/"; license = licenses.gpl3Only; maintainers = with maintainers; [ heijligen ]; diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 0c3ff788d468..4796f53037be 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; + hash = "sha256-HCxq8jCT3aHOXeYue7KP5sYzO6nJnB9Sy8gKGZpZHbc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 05a94d1f2dc3..aa29025c3f24 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fire"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "google"; repo = "python-fire"; rev = "refs/tags/v${version}"; - hash = "sha256-tBmsy0MuJu0Ei+4lUy/XfKoOU+OuH4xqmjPv/uKVuwg="; + hash = "sha256-cYlkMnZOa0J6dOiWsWZplk/MajVRiCYe8tK3641fD0w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 15c39a634980..a64bc19ea2e6 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -6,8 +6,9 @@ buildPythonPackage, cryptography, fetchFromGitHub, + hatchling, http-ece, - poetry-core, + myst-parser, protobuf, pytest-asyncio, pytest-mock, @@ -23,16 +24,16 @@ buildPythonPackage rec { pname = "firebase-messaging"; - version = "0.3.0"; + version = "0.4.4"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sdb9696"; repo = "firebase-messaging"; rev = "refs/tags/${version}"; - hash = "sha256-pZpnekJ11yx3L8l56vZOa4uS+jJMxUkYODgNAqysVeY="; + hash = "sha256-duUqDioIBo2QQP/4VGGwklDt4F8pDm/sHrvOx4wcTWQ="; }; outputs = [ @@ -40,12 +41,19 @@ buildPythonPackage rec { "doc" ]; + build-system = [ + hatchling + ]; + nativeBuildInputs = [ - poetry-core sphinxHook ] ++ optional-dependencies.docs; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "http-ece" + ]; + + dependencies = [ aiohttp cryptography http-ece @@ -54,6 +62,7 @@ buildPythonPackage rec { optional-dependencies = { docs = [ + myst-parser sphinx sphinx-autodoc-typehints sphinx-rtd-theme diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 75a8044d85b0..6235c3ebac39 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.3.7"; + version = "5.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; rev = "refs/tags/v${version}"; - hash = "sha256-3vqhxz+NPrpjTxNt4scZtPxaFfnM3+gyE+jegwgan2E="; + hash = "sha256-owlgbw0QBUz2wCBxd1rjMI+4nPVTZ6JgmU2tL+vIj5g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 153f25ad2cb1..6b6994db5071 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "getjump"; - version = "2.5.0"; + version = "2.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U="; + hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index ae1bdc82ae7f..70d7da0936fe 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.7.2"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KVKoPCpMaaVMU6VqYXD7vHmhv1AS5slRobRVDDuaDHc="; + hash = "sha256-7l7Tg4sCdRtYnDwrQBA4rUIz4gO2YGf+3qn7OQRMCDc="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/google-photos-library-api/default.nix b/pkgs/development/python-modules/google-photos-library-api/default.nix new file mode 100644 index 000000000000..49feac0a0be2 --- /dev/null +++ b/pkgs/development/python-modules/google-photos-library-api/default.nix @@ -0,0 +1,49 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + google-api-python-client, + google-auth, + lib, + mashumaro, + pytest-aiohttp, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "google-photos-library-api"; + version = "0.12.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "python-google-photos-library-api"; + rev = "refs/tags/${version}"; + hash = "sha256-xSwUzVwC7RPpmC9M1x/WYIaoiUlcF2h2fwiP6FYA6sw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + google-api-python-client + google-auth + mashumaro + ]; + + pythonImportsCheck = [ "google_photos_library_api" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/allenporter/python-google-photos-library-api/releases/tag/${version}"; + description = "Python client library for Google Photos Library API"; + homepage = "https://github.com/allenporter/python-google-photos-library-api"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index efcc03f3bc2b..034300b2b318 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.1.2"; + version = "6.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-hvT4e1l3MTT3WMDSfKvZ7BU8dzkzgPROHrnx5mKyCR4="; + hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/handy-archives/default.nix b/pkgs/development/python-modules/handy-archives/default.nix index 079d2bc99555..6bafb066cb57 100644 --- a/pkgs/development/python-modules/handy-archives/default.nix +++ b/pkgs/development/python-modules/handy-archives/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { [ ]; - nativeCheckInputs = [ ]; - meta = { description = "Some handy archive helpers for Python."; homepage = "https://github.com/domdfcoding/handy-archives"; diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 666f527fce40..0b96700f267d 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.2.1"; + version = "6.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-1omRBbUNS2/U2laK7E1M0uZfejZVMdGezG5oIGILj70="; + hash = "sha256-t5AI2wpSM6xMzULEZYkUgGvcODM8PVxdd2Vy/PV0Ga4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 6ac92f94406d..9ee9110ef092 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -19,22 +18,18 @@ packaging, rich, tensorflow, - pythonAtLeast, - distutils, }: buildPythonPackage rec { pname = "keras"; - version = "3.5.0"; + version = "3.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-hp+kKsKI2Jmh30/KeUZ+uBW0MG49+QgsyR5yCS63p08="; + hash = "sha256-zbeGa4g2psAofYAVuM7BNWI2gI21e739N5ZtxVfnVUg="; }; build-system = [ @@ -53,7 +48,7 @@ buildPythonPackage rec { packaging rich tensorflow - ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; + ]; pythonImportsCheck = [ "keras" diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index 42c4537bff42..5b4de628d7ca 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "krb5"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cSugkvvjoo7BiCC7Gx7SzBA3t1xccDP5cMaoyXu9Egk="; + hash = "sha256-ajCPLhfRUcOVsk5q7Hvf9qVv42J6MgQvyG1BI5ipLd0="; }; build-system = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 759923d78c23..09e7f9fa4845 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "4.0.0"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-jIbSKT/jRWVyN2LH6Ih0VFc5QKICR7cYONzGpZ9bJvM="; + hash = "sha256-M55cwT7BrY+8m9ec+2bKDCxGkHJp/c50Gzib4sEg7Bk="; }; sourceRoot = "${src.name}/libs/labelbox"; diff --git a/pkgs/development/python-modules/lektricowifi/default.nix b/pkgs/development/python-modules/lektricowifi/default.nix new file mode 100644 index 000000000000..b6b4a5142c3c --- /dev/null +++ b/pkgs/development/python-modules/lektricowifi/default.nix @@ -0,0 +1,58 @@ +{ + async-timeout, + buildPythonPackage, + fetchFromGitHub, + httpx, + lib, + pydantic, + pytest-asyncio, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "lektricowifi"; + version = "0.0.43"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Lektrico"; + repo = "lektricowifi"; + rev = "refs/tags/v.${version}"; + hash = "sha256-NwM1WpH6tS0iAVpG2gSFJpDPPn9nECHAzpOnWzeYPH4="; + }; + + postPatch = '' + substituteInPlace tests/test_mocked_devices.py \ + --replace-fail "from asyncmock import AsyncMock" "from unittest.mock import AsyncMock" + ''; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "pydantic" + ]; + + dependencies = [ + async-timeout + httpx + pydantic + ]; + + pythonImportsCheck = [ "lektricowifi" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # AttributeError: type object 'InfoForCharger' has no attribute 'from_dict' + doCheck = false; + + meta = { + description = "Communication with Lektrico's chargers"; + homepage = "https://github.com/Lektrico/lektricowifi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix index f58bcfe18057..6bf2ec3eeeb7 100644 --- a/pkgs/development/python-modules/macholib/default.nix +++ b/pkgs/development/python-modules/macholib/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -32,6 +33,8 @@ buildPythonPackage rec { typing-extensions ]; + # Checks assume to find darwin specific libraries + doCheck = stdenv.buildPlatform.isDarwin; nativeCheckInputs = [ unittestCheckHook ]; @@ -49,7 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/ronaldoussoren/macholib"; changelog = "https://github.com/ronaldoussoren/macholib/releases/tag/v${version}"; license = licenses.mit; - platforms = platforms.darwin; maintainers = with maintainers; [ eveeifyeve ]; }; } diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index 0ef0941b2ba3..9c520c0bde76 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -35,7 +35,7 @@ }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.1.7"; + version = "5.1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-egQYL4Qvs1fQcJ5WEM461TSYqs2XN39wbyfx9uEFeIs="; + hash = "sha256-0csCUJpIeq3EyER9gqiUgqrfHL9WSzX144Y0djL3dqQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 537a80408c66..eaed123ef903 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + setuptools, # dependencies aiofiles, @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = "refs/tags/${version}"; - hash = "sha256-wk1UjnazBdK4BCWXRG5Bn9Rasrk+yy3qqideS8tEAk8="; + hash = "sha256-cfxM/k0AXP/47goWahAzY36dpZiR00gmNveyoxQWvjo="; }; patches = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { ./allow-tests-without-olm.patch ]; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ aiofiles diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 9f4fb1e4b8f7..864b6c8cc5a6 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-serialization-json-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Unscul4mznB3yJmn8Y/Zcvbk59V1WLqdSgmEhCUgkeA="; + hash = "sha256-J+wX2vF1LZHq88RDhda6NDeYioZzAz2BxovVFz2xxfw="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index d552736a6920..ba3a72976f58 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -21,35 +21,12 @@ tifffile, lmdb, mmengine, - symlinkJoin, }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; + inherit (cudaPackages) backendStdenv; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = - with cudaPackages; - [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] - ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in buildPythonPackage rec { pname = "mmcv"; @@ -65,6 +42,8 @@ buildPythonPackage rec { hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc="; }; + env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc); + preConfigure = '' export MMCV_WITH_OPS=1 @@ -77,7 +56,7 @@ buildPythonPackage rec { ''; postPatch = '' - substituteInPlace setup.py --replace "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" + substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" ''; preCheck = '' @@ -102,12 +81,23 @@ buildPythonPackage rec { nativeBuildInputs = [ ninja which - ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; + ]; - buildInputs = [ - pybind11 - torch - ] ++ lib.optionals cudaSupport [ cuda-redist ]; + buildInputs = + [ + pybind11 + torch + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart # cuda_runtime.h + cuda_cccl # + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ] + ); nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index 5604a067734d..47c167237836 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "modelcif"; - version = "1.0"; + version = "1.1"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; rev = "refs/tags/${version}"; - hash = "sha256-zJLwBdyUyWnH1hBx9Kejl5NfY7zJUxeGb//swBT02Dw="; + hash = "sha256-HUS9MW6jbwjK3I6egmmsH+Bx+nNgszWc3t3QRo/EWpc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix index 12e4cabb0768..d771128a7903 100644 --- a/pkgs/development/python-modules/open-interpreter/default.nix +++ b/pkgs/development/python-modules/open-interpreter/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "git-python" ]; pythonRelaxDeps = [ + "google-generativeai" "psutil" "pynput" "yaspin" diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9f0704d7a3d0..3c465a430a29 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-IMw0mpOUzjXBy4bMTeSFMc5pdibI5lGxZHKiufjPLbM="; + hash = "sha256-LrCBCfIcpxNjy/yjwCG4J34eJO4AdUr21kp9FBwSeAY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 6874fd866e82..228b89890f96 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -33,12 +33,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.13.0"; + version = "4.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HVyiU4PsEPtk4o0ULB2Gj5HqHFOpPTUx0wFdgwgo08M="; + hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix index b98f5228ec06..03fbc02e3687 100644 --- a/pkgs/development/python-modules/py-ocsf-models/default.nix +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-ocsf-models"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "prowler-cloud"; repo = "py-ocsf-models"; rev = "refs/tags/${version}"; - hash = "sha256-NGhlMBNoa8V3vo/z6OBAWqNCSlTyUutiyrTcCe1KF+4="; + hash = "sha256-cFtWPO78KRh7IY+ePTzXpLPbZm+EtNvuJkhZZzKKjaA="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 7fe3f1f61f4d..8361171fc261 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "py-synologydsm-api"; rev = "refs/tags/v${version}"; - hash = "sha256-c1qNCOmGEiI+bHDGxJ7OtdmPFcdkev+5U9cuDC8O5iQ="; + hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index fdabb3f9ef67..867ca8ba31cb 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-olQZ7e4RmjL1KVtJvPsXICgL2VCOIFnZCW8WjKO3X+Q="; + hash = "sha256-1H7TqFPVstB+nCYwWOT8E2HcmkLQx9pekBq2WIAf8DQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 11e2f832d14c..4cfd8c41c19c 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -247,7 +247,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.9.15" +version = "0.9.16" dependencies = [ "pyo3", "yrs", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 56fef5666e9e..952052246a4a 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.9.15"; + version = "0.9.16"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-iaFpBD07l1WlC5FNzFxxF5gJS59yAyPmEn/NZg5U0AQ="; + hash = "sha256-AO5KGBG4I+D5q/VSifzmg0ImAujR1ol9zGU4Y61fImc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 68e31e000270..1cd8c6e8a91d 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "116"; + version = "117"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8="; + hash = "sha256-G04Lb92yrSQBs/Vc3wW60jR74nsWzfjAUfQPzqVhoLk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 201902949cf2..028f69488777 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.13"; + version = "1.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pygraphviz"; repo = "pygraphviz"; rev = "refs/tags/pygraphviz-${version}"; - hash = "sha256-/H7eHgs3jtbgat8//1Y1S3iV5s0UBKW+J+zK+f8qGqI="; + hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8="; }; patches = [ diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix new file mode 100644 index 000000000000..844299d01bc6 --- /dev/null +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -0,0 +1,41 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + pymodbus, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyiskra"; + version = "0.1.14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Iskramis"; + repo = "pyiskra"; + rev = "refs/tags/v${version}"; + hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pymodbus + ]; + + pythonImportsCheck = [ "pyiskra" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/Iskramis/pyiskra/releases/tag/v${version}"; + description = "Python Iskra devices interface"; + homepage = "https://github.com/Iskramis/pyiskra"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index e0e5aab54350..d7062da6c80b 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -2,26 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - authlib, - httpx, + setuptools, + aiohttp, }: buildPythonPackage rec { pname = "pypoint"; - version = "2.3.2"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; rev = "v${version}"; - hash = "sha256-tQ5rQs6ECn9O9dVXKWhmy9BBpOzgqSmwpmbIRbJn2CQ="; + hash = "sha256-Ri+vf/vnjQQ+9eZ1Gzt+v68FAxVGt0IY9S3SpeVem3A="; }; - propagatedBuildInputs = [ - authlib - httpx - ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # upstream has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix index 246146a1c5a2..a3b6ca4b0319 100644 --- a/pkgs/development/python-modules/pyproject-parser/default.nix +++ b/pkgs/development/python-modules/pyproject-parser/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { shippinglabel typing-extensions ]; - - nativeCheckInputs = [ ]; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index d334e099908f..907fbad8fd67 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI="; + hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 3fa3a1dfe700..540d1fbff830 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pysnmp"; - version = "6.2.5"; + version = "6.2.6"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-EGMUTUN95wykU756GJSiXwr8Hi3kyaLPfqhuDgvhbBE="; + hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY="; }; pythonRemoveDeps = [ "pytest-cov" ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SNMP library"; homepage = "https://github.com/lextudio/pysnmp"; - changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/lextudio/pysnmp/blob/${src.rev}/CHANGES.rst"; license = licenses.bsd2; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch b/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch deleted file mode 100644 index 784ddd3f3427..000000000000 --- a/pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5f843f7c8554e2feab7f57d8718231408196fd80 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Fri, 1 Nov 2019 18:47:14 +0100 -Subject: [PATCH] setup.py: Fix the setuptools version check - -This broke the Nix build after setuptools.__version__ changed from -"41.2.0" to "41.4.0.post20191022". ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 0d987d5c..4f625d7c 100644 ---- a/setup.py -+++ b/setup.py -@@ -63,7 +63,7 @@ try: - - setup, Command = setuptools.setup, setuptools.Command - -- observed_version = [int(x) for x in setuptools.__version__.split('.')] -+ observed_version = [int(x) for x in setuptools.__version__.split('.')[0:3]] - required_version = [36, 2, 0] - - # NOTE(etingof): require fresh setuptools to build proper wheels --- -2.23.0 - diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index eb7f653db9de..c97862176e26 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "stac-utils"; repo = "pystac"; - rev = "v${version}"; - hash = "sha256-zJGDhKRX50Muo1YDEzfwypMLISnYBYKkPvUULYkUf68="; + rev = "refs/tags/v${version}"; + hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 95e73ca2bb52..2242b0b7c891 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.1"; + version = "8.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-C2qFC0KOPO8I2CIDgFl0L7LyPgvqfqEeYdPAvwIJ+PY="; + hash = "sha256-EK1jZajACdc5IWF/Tgg3albUAH566G0IwUsHk4dZpoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 4a99321dc880..079aa23b8ad7 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.19"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nkgilley"; repo = "python-ecobee-api"; rev = "refs/tags/${version}"; - hash = "sha256-osEqDUVf7fU5DWRUQyFaM8jOi2OgSqbtMaLSWMKQMPw="; + hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index dcb2a96f671a..9561deec1b07 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -14,6 +14,7 @@ pytest-asyncio, pytest-freezer, pytest-mock, + pytest-socket, pytestCheckHook, pythonOlder, rich, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-41FY1KaPDQxOHtxgaKRakNbiBm/qPYCICpvzxVAmSD8="; + hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI="; }; build-system = [ hatchling ]; @@ -48,6 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytest-freezer pytest-mock + pytest-socket pytestCheckHook voluptuous ]; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 453bf9b8b7c2..8a736730ef54 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -24,6 +24,7 @@ zeroconf, # tests + aioresponses, python, pytest, pytest-aiohttp, @@ -55,7 +56,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "6.3.0"; + version = "6.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-/e7U0knkWQq9PnTimA2/ncNTyekx7QOcFEdtJHUcb9I="; + hash = "sha256-g+97a/X0FSapMLfdW6iNf1akkHGLqCmHYimQU/M6loo="; }; patches = [ @@ -105,6 +106,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses pytest-aiohttp pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index f38927594aa7..bae26634aa2a 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.9.66"; + version = "2024.9.67"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-Vx5ShmEARDfQtIldTQuL0LkLUdo0QE/ANsLa4yq3OXo="; + hash = "sha256-+NfttxsUzNVg0YL6H0ULeDb/xobMvUeGwWY/egN9aWY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index cb02a16bc390..572a4417ccad 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -145,7 +145,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web apps in pure Python"; homepage = "https://github.com/reflex-dev/reflex"; - changelog = "https://github.com/reflex-dev/reflex/releases/tag/${src.rev}"; + changelog = "https://github.com/reflex-dev/reflex/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; mainProgram = "reflex"; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index daba92a14a6c..2d85f85eb80b 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.2"; + version = "7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-TR0w9wmmYhynxCNvCLZ7cyplHICZFF8TcHjH3UvtPSE="; + hash = "sha256-iIgwTHhY/c/YbFC1hWF5c3W6QDGdK2/7XSSwi2otzWE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 4bfbc9d1e54a..b417ea9269c9 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-NnKcUr0SExXRDkNCIGU3LtwU1LIMAZzurn2Aoua1lzA="; + hash = "sha256-pSHsQ2bJ0zNk6eJfDERVFqZM/IWorL8HFFjnwnhaHhY="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; @@ -42,16 +42,13 @@ buildPythonPackage rec { aiofiles aiohttp asyncclick + firebase-messaging oauthlib pytz typing-extensions websockets ]; - optional-dependencies = { - listen = [ firebase-messaging ]; - }; - nativeCheckInputs = [ aioresponses freezegun diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 4593f30b8db2..b5b527b2b402 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; rev = "refs/tags/${version}"; - hash = "sha256-mzcesoBU8sOznAgvi2u8NsUheyLXPZuyIkGghbc556c="; + hash = "sha256-t1t0uksmdPTrksDF0K3/f3KxAv0fX2W8wDIIcWAPEVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 3f314290871d..6dcbe3c0e897 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-oxlWx3cB+gsFwSre+e8e792Y012zOzhUrO0wxEwzrgI="; + hash = "sha256-VHaCpoASy+pYmfx5X7hrH7hMnP0OTxD/5EPPZy7POaA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shippinglabel/default.nix b/pkgs/development/python-modules/shippinglabel/default.nix index 5cb75872f870..c523714e4ff2 100644 --- a/pkgs/development/python-modules/shippinglabel/default.nix +++ b/pkgs/development/python-modules/shippinglabel/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index d9d3d09a4552..e2df0cedfc65 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "snakemake"; repo = "snakemake-interface-common"; rev = "refs/tags/v${version}"; - hash = "sha256-91Sh6JNpCEWPRkrEwoJeycZS1D4lXWA4IJLVcxBYLnI="; + hash = "sha256-PMEs7yeVfSnZKbabLrbXfIKCIPteNV1wzbt9RIDG3qU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix index c20a0ad12246..5d5518de96db 100644 --- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-report-plugins"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-30x4avA3FrqZ4GoTl6Js5h3VG5LW7BNHOcNWxznXoT0="; + hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index f180d5c6c3a8..451976c79b52 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2024.6.0"; + version = "2024.9.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "sshfs"; rev = "refs/tags/${version}"; - hash = "sha256-8Vut/JDLmWrTys8aaIBRbaWlvGCg6edaXmMCFxjGhag="; + hash = "sha256-rRcXimthyFLBqt0nMEv7bisL+JNLLZuRH7BopSLM7QQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index ce40ef338b11..fee2015a8ab0 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.8.1"; + version = "4.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qwU0SsS9qxKtUsZcsMZQ9NqB+Ye8lhDO8tR+ThmoxY8="; + hash = "sha256-Mz6n7QjNvK2HEQeWCySdxioA1dD5CLUh7jCQb1Q6mdc="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index bee77028970e..ee01a24bebcc 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.0.2"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-3Dmim+wSAhco3KvtbAT/f/feNriaI22m0ml4L9SJFPs="; + hash = "sha256-SWEWh1c5GcMrjJlcLtXScRNoem2ACGt3nFC4+ARMIIw="; }; build-system = [ poetry-core ]; @@ -89,6 +89,12 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # https://127.0.0.1 vs https://127.0.0.1:0 + "test_base_url" + "test_bootstrap" + ]; + pythonImportsCheck = [ "uiprotect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index da172aa79ff7..f0a4497c6944 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.100"; + version = "0.2.107"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; - rev = "refs/tags/${version}"; - hash = "sha256-+Rvb4VY4qBcVKM1CUkLZTQdlZklpHcuiMO8r6VNInLc="; + rev = "refs/tags/v${version}"; + hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk="; }; build-system = [ diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix index 44c490f28014..c40292ede641 100644 --- a/pkgs/development/python-modules/whey-pth/default.nix +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { whey ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 9c7cad7a1039..7c1aaec13e6c 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -41,8 +41,6 @@ buildPythonPackage rec { shippinglabel ]; - nativeCheckInputs = [ ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 4fae5aaf31d2..b49e0e4cbd82 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.43"; + version = "0.2.44"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-pHjOXxnANnqypcycqdIV8/6u/qVVNnRFAeL4xsHjk3w="; + hash = "sha256-XaenqZMvbimuptfCpvyhXxvbJTPA94+nN938HI5gDQo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index c23d94c7af64..b06ccc46b0ad 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.133.0"; + version = "0.135.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-nS3zr+56K819GujzA4uLqcZJb4OxbAOV3FfxssDEEQA="; + hash = "sha256-3zUY9zOmC2avR7rO5O22lqqEY5ql612fRutbGl7SYKs="; }; build-system = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 7e9720163c8c..05040663a579 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.121"; + version = "0.0.122"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-+HDW07fFh47gW7xNaymylSt8TT2Vzz+6IWSPLtkk/Nw="; + hash = "sha256-/xxMcZPwIL76F+E3Rp0/VtzFOrk7e4i1knf/OIAf+48="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index f8c83870f9f1..1847b2c49d8e 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.33"; + version = "0.0.34"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-qcXKHIiEm1wqcQKRH+TqgQMPZbLqNnBiR6dbmLwxW1Y="; + hash = "sha256-or4mZpfcVl7fTf8O1vBxEeeJvhYNgrlV+FClrzQG/lg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index bc3fec15864e..9edb65707b9f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.66.0"; + version = "0.67.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-Rv45WP6KxsFY/eGgNja5JSgmVKQWrRbP6K4tz6CFpMs="; + hash = "sha256-06RKvKOXMhq6LwKSk451cR7EUW+78AZzWsrqSMgq02E="; }; postPatch = '' 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 bb374e1ec42b..d2caa2c2f383 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.57.0"; + version = "0.58.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-5Kvk73tRnHFi5YDzMmRj1r7gKuAPkecPF9q9L2qhAUI="; + hash = "sha256-hszt14ymZQsUg0zfJ7+cY08DlXNaWzxKwV/i4i29DtI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 0865a3b7ae79..85679357520b 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.10"; + version = "1.28.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; rev = "refs/tags/v${version}"; - hash = "sha256-Dulbo5ZTw4+1XxjpnZ1aIsVPLVEqwQKdNMv+L9/j1wc="; + hash = "sha256-7e75VdqwjzP+GyTtXqOf1pN+5wEbxNYoUcpsTjwB+0Y="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-Hu530cBJWGtvMmQ6gbROXf5JBfkOfc4nwznsKBTegUk="; + vendorHash = "sha256-Zr6Z9Px1nxkr6fKWINMbp6cESZeZkxnuDPwbV+WX2Oo="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index ae152a3782ab..f8300db3c064 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -1,102 +1,34 @@ -{ buildBazelPackage -, bazel_5 -, fetchFromGitHub -, git -, go_1_21 -, python3 -, lib, stdenv +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + bazel-watcher, }: -let - patches = [ - ./use-go-in-path.patch - ]; - - # Patch the protoc alias so that it always builds from source. - rulesProto = fetchFromGitHub { - owner = "bazelbuild"; - repo = "rules_proto"; - rev = "4.0.0"; - hash = "sha256-WVPZx14thneAC4PdiDhBibnPwlCKEF9c93CHR0t1Efo="; - postFetch = '' - sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release - cat <>$out/proto/private/BUILD.release - alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) - EOF - ''; - }; - -in -buildBazelPackage rec { +buildGoModule rec { pname = "bazel-watcher"; - version = "0.25.2"; + version = "0.25.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - hash = "sha256-lreGKA0DZiOd1bJq8NNQ+80cyDwiughoXCkKu1RaZmc="; + hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM="; }; - nativeBuildInputs = [ go_1_21 git python3 ]; - removeRulesCC = false; + vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; - bazel = bazel_5; - bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ]; - bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; - bazelTargets = [ "//cmd/ibazel" ]; + CGO_ENABLED = "0"; + ldflags = [ + "-s" + "-X main.Version=${version}" + ]; - fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system - fetchAttrs = { - inherit patches; + subPackages = [ "cmd/ibazel" ]; - preBuild = '' - patchShebangs . - - echo ${bazel_5.version} > .bazelversion - ''; - - preInstall = '' - # Remove the go_sdk (it's just a copy of the go derivation) and all - # references to it from the marker files. Bazel does not need to download - # this sdk because we have patched the WORKSPACE file to point to the one - # currently present in PATH. Without removing the go_sdk from the marker - # file, the hash of it will change anytime the Go derivation changes and - # that would lead to impurities in the marker files which would result in - # a different hash for the fetch phase. - rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} - sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker - - # Retains go build input markers - chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} - - # Remove the gazelle tools, they contain go binaries that are built - # non-deterministically. As long as the gazelle version matches the tools - # should be equivalent. - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker - - # remove com_google_protobuf because it had files with different permissions on linux and darwin - rm -rf $bazelOut/external/com_google_protobuf - ''; - - sha256 = "sha256-B2KVD/FmkAa7MNhLaH286gF3uA20qjN3CoA83KRB9E8="; - }; - - buildAttrs = { - inherit patches; - - preBuild = '' - patchShebangs . - - substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version} - echo ${bazel_5.version} > .bazelversion - ''; - - installPhase = '' - install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel - ''; + passthru = { + tests.version = testers.testVersion { package = bazel-watcher; }; }; meta = with lib; { diff --git a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/pkgs/development/tools/bazel-watcher/use-go-in-path.patch deleted file mode 100644 index 5ce4f81ff3ae..000000000000 --- a/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 51273b6..fcf9ffb 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe - - go_rules_dependencies() - --go_register_toolchains(version = "1.19.4") -+go_register_toolchains(go_version = "host") - - load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") - diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index f21c91e86445..19d228a955cc 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.7.0", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.0/gauge-dotnet-0.7.0.zip", - "hash": "sha256-u+Ir6Qlz7C8KNrfzy2wVrltkcruUZ954OaEwRtR52ds=" + "version": "0.7.1", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.1/gauge-dotnet-0.7.1.zip", + "hash": "sha256-0sJctSdQfkm70Z1JDFMc2qwo0PbDWYlHbqfVsnlHyDg=" } diff --git a/pkgs/development/tools/gauge/plugins/java/data.json b/pkgs/development/tools/gauge/plugins/java/data.json index f5a9e09edfdc..764a22697bb4 100644 --- a/pkgs/development/tools/gauge/plugins/java/data.json +++ b/pkgs/development/tools/gauge/plugins/java/data.json @@ -1,19 +1,19 @@ { - "version": "0.11.0", + "version": "0.11.1", "aarch64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.arm64.zip", - "hash": "sha256-o7viYih6oghPipGmpsdGZXxtML4++Ux7Qul8pRzkdUc=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.arm64.zip", + "hash": "sha256-KoUVku5DRi6sUYCMJ5/DBEYv4NlNEcHdOlYGsfYR0Yw=" }, "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.x86_64.zip", - "hash": "sha256-wTXVuyXU9mfVxAc/l0mgvKt3c/jinffILBUhe/tikgs=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.x86_64.zip", + "hash": "sha256-ea2s3b38MG8r7i6IqlOjQ2Wc7b237Eu1VL7euwNW43M=" }, "aarch64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.arm64.zip", - "hash": "sha256-CsEzoNseWllbNtN5mOYVCPvTPlm60fd7eSXuTpxbRx8=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.arm64.zip", + "hash": "sha256-QbQWDYkk+XnJReqx+Kj3hvGSDM7ACjDEWVFKd34hZkw=" }, "x86_64-linux": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.x86_64.zip", - "hash": "sha256-zig+Wq6uyBl8fKfjcpKCRFtHBZ/xFeDaUrUqvx1ails=" + "url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.x86_64.zip", + "hash": "sha256-Ikt8rE8tehLXtWa4CjU6tWiBvOVoDpds8Jgy8QwW6lY=" } } diff --git a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch b/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch deleted file mode 100644 index 29330131499b..000000000000 --- a/pkgs/development/tools/misc/binutils/gold-powerpc-for-llvm.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -Fix llvm testsuite failure on a single test: - FAIL: LLVM :: tools/gold/PowerPC/mtriple.ll (43659 of 49708) - ld.gold: internal error in add_output_section_to_load, at output.cc:4097 - -From: Alan Modra -Date: Thu, 24 Aug 2023 23:42:18 +0000 (+0930) -Subject: PR30794, PowerPC gold: internal error in add_output_section_to_load -X-Git-Tag: gdb-14-branchpoint~482 -X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=d537f77ef3b18a5fbfd598643aaad957652e9608 - -PR30794, PowerPC gold: internal error in add_output_section_to_load - -Caused by commit 5a97377e5513, specifically this code added to -Target_powerpc::do_relax -+ if (parameters->options().output_is_position_independent()) -+ this->rela_dyn_size_ -+ = this->rela_dyn_section(layout)->current_data_size(); - -The problem here is that if .rela.dyn isn't already created then the -call to rela_dyn_section creates it, and as this comment in -Target_powerpc::do_finalize_sections says: - // Annoyingly, we need to make these sections now whether or - // not we need them. If we delay until do_relax then we - // need to mess with the relaxation machinery checkpointing. -We can't be creating sections in do_relax. - - PR 30794 - * powerpc.cc (Target_powerpc::do_relax): Only set rela_dyn_size_ - for size == 64, and assert that rela_dyn_ already exists. - Tidy code setting plt_thread_safe, which also only needs to be - set when size == 64 for ELFv1. ---- - -diff --git a/gold/powerpc.cc b/gold/powerpc.cc -index e66d9cbb900..a4fecaae55a 100644 ---- a/gold/powerpc.cc -+++ b/gold/powerpc.cc -@@ -3714,12 +3714,7 @@ Target_powerpc::do_relax(int pass, - unsigned int prev_brlt_size = 0; - if (pass == 1) - { -- bool thread_safe -- = this->abiversion() < 2 && parameters->options().plt_thread_safe(); -- if (size == 64 -- && this->abiversion() < 2 -- && !thread_safe -- && !parameters->options().user_set_plt_thread_safe()) -+ if (size == 64 && this->abiversion() < 2) - { - static const char* const thread_starter[] = - { -@@ -3747,29 +3742,37 @@ Target_powerpc::do_relax(int pass, - /* libgo */ - "__go_go", - }; -+ bool thread_safe = parameters->options().plt_thread_safe(); - -- if (parameters->options().shared()) -- thread_safe = true; -- else -+ if (!thread_safe -+ && !parameters->options().user_set_plt_thread_safe()) - { -- for (unsigned int i = 0; -- i < sizeof(thread_starter) / sizeof(thread_starter[0]); -- i++) -+ if (parameters->options().shared()) -+ thread_safe = true; -+ else - { -- Symbol* sym = symtab->lookup(thread_starter[i], NULL); -- thread_safe = (sym != NULL -- && sym->in_reg() -- && sym->in_real_elf()); -- if (thread_safe) -- break; -+ for (unsigned int i = 0; -+ i < sizeof(thread_starter) / sizeof(thread_starter[0]); -+ i++) -+ { -+ Symbol* sym = symtab->lookup(thread_starter[i], NULL); -+ thread_safe = (sym != NULL -+ && sym->in_reg() -+ && sym->in_real_elf()); -+ if (thread_safe) -+ break; -+ } - } - } -+ this->plt_thread_safe_ = thread_safe; - } -- this->plt_thread_safe_ = thread_safe; - -- if (parameters->options().output_is_position_independent()) -- this->rela_dyn_size_ -- = this->rela_dyn_section(layout)->current_data_size(); -+ if (size == 64 -+ && parameters->options().output_is_position_independent()) -+ { -+ gold_assert (this->rela_dyn_); -+ this->rela_dyn_size_ = this->rela_dyn_->current_data_size(); -+ } - - this->stub_group_size_ = parameters->options().stub_group_size(); - bool no_size_errors = true; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index f5af6c868c85..ec721340b34c 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "linuxkit"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-Od6ij4RUWWNN3pm6Yt8W7LkeHnrusikJi2pXw6axbhU="; + sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA="; }; vendorHash = null; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index a3f5942a6bfd..45f1af60ecf9 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation ({ sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ; }; - buildInputs = [ ]; - patchPhase = "chmod +x configure"; configurePhase = "./configure -t lite"; diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix deleted file mode 100644 index 663a13af370d..000000000000 --- a/pkgs/development/tools/overcommit/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "overcommit"; - gemdir = ./.; - exes = [ "overcommit" ]; - - passthru = { - updateScript = bundlerUpdateScript "overcommit"; - }; - - meta = with lib; { - description = "Tool to manage and configure Git hooks"; - homepage = "https://github.com/sds/overcommit"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne anthonyroussel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 89419379239f..aec4eab2e5de 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.10.0"; - hash = "sha256-NVqKuNu2rUG+++85vE/Wtd+F4Sdh0nJL0B8T6HjeSxM"; + version = "9.12.0"; + hash = "sha256-phtn/2zJevhkVk9EQlVsIqBPLlp3FPvudqEBE2HZtyY="; }; }; diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 11e143dfda23..4b4f81056e38 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.15.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+LSwZ1AugYhMlt1XcG8i8SIORO0vFMUxJrF6z3Crus="; + sha256 = "sha256-J0ZRJ05MDO92Oa/82FPM69Xrge1ATHF4kgNUd5YISFc="; }; - vendorHash = "sha256-JTKoEuO3D+/MO7FeSu1tiVqERkQiu2nG/KiEth1ylG0="; + vendorHash = "sha256-M5LbB71fcEhXoDFd17TSruzl9y9tqiQpREwV/ZgvdQ4="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index 17ba08923b1f..4ee8ec165f5e 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.17.2"; + version = "0.17.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-No2xlLRSNvjgW5WtQ8u3Wev/+RyamsJ2f6p4ONKeRe0="; + hash = "sha256-DOV4QjtjOH1420KH70kkISo9lNbcjbnAn34MnAJWYvQ="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-oc3Hc0mWuL9bd1SgyJD9nK9kuPLZEaWFbydL/ti09HU="; + cargoHash = "sha256-aC6IxamPHRZ1V6ZTiXGVSt4YIa+GPK/j6IWh86JOrV8="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index b98d1dd513e0..cc6427400304 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "14.1.1"; + version = "15.0.0"; src = fetchCrate { inherit pname version; - hash = "sha256-2UV+BetL6MBHAyPcMTbssLNgJQKoJOo2iG3uGPWSrUs="; + hash = "sha256-2Z/fRd80qZi61KO07gx3Jdnslxv1KUCubv9bIUmjGKU="; }; - cargoHash = "sha256-Qn2DquO3HmhZvCk6FaowodgURvtA5gXrztN+wp60bSA="; + cargoHash = "sha256-v5rsFzox1x2pf/LilZy/YI985sL5Pigm2GGaCWWjB7s="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index 7bbc503fd128..b5da3fdb7f0d 100644 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform -, CoreServices, Security +{ + lib, + stdenv, + fetchFromGitHub, + openssl, + perl, + pkg-config, + rustPlatform, + CoreServices, + Security, + fetchpatch, }: rustPlatform.buildRustPackage rec { @@ -13,16 +22,34 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; + patches = [ + (fetchpatch { + name = "fix-qualified-path.patch"; + url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; + hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; + }) + ]; + cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - nativeBuildInputs = [ openssl perl pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ + openssl + perl + pkg-config + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + CoreServices + Security + ]; meta = with lib; { description = "Cargo subcommand for the client-side Web"; mainProgram = "cargo-web"; homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ kevincox ]; }; } diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index da97f7e61bb8..f5cc94fea54b 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "24.1.1"; + version = "24.1.2"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-BGSe05I1NconPkPCzGOOLPbH/JSlwXvAWbViJVYMU/c="; + hash = "sha256-YeTKW7Aq7VLCD8FabnqDTcgvSeHNa96ZT8KQ4KNrrw4="; }; - npmDepsHash = "sha256-DsBklxeY9RbvFsEA56vkmvVms+W9mr9qA/JVgAgs81k="; + npmDepsHash = "sha256-pyTfdVdaHi8oABhI6GoHi6HusTUMEyngGAR2Tw5bF2c="; dontNpmBuild = true; diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index cc183cb7c1da..6ef2bb380fff 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "chiaki-ng"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "streetpea"; repo = "chiaki-ng"; rev = "v${version}"; - hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew="; + hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI="; fetchSubmodules = true; }; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index abeda56f5165..739b431d99f8 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.14.1"; + version = "10.15.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-7awNvXlumeY6GXB91rUs8/rWIon0ig3C6S11fBdRj6Y="; + hash = "sha256-zKF9ef28lZns2WWZ7BjLSP7Z5N5+wIaztLmgfzA05+c="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE="; + vendorHash = "sha256-PoP4dMhNj+pHPSNmX24W/qipUJJeL88mjx1sqtcF40M="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch b/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch deleted file mode 100644 index 50c6a983fe4d..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/spinlocks.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- objc4-551.1/runtime/objc-os.h 2013-06-10 21:16:15.000000000 -0400 -+++ ../objc4-551.1/runtime/objc-os.h 2015-01-19 01:01:36.000000000 -0500 -@@ -77,27 +77,72 @@ - # include - # include - # include --# include - # include - # include --# include - # include "objc-probes.h" // generated dtrace probe definitions. - -+#define __PTK_FRAMEWORK_OBJC_KEY5 45 -+#define __PTK_FRAMEWORK_OBJC_KEY6 46 -+#define __PTK_FRAMEWORK_OBJC_KEY7 47 -+#define __PTK_FRAMEWORK_OBJC_KEY8 48 -+#define __PTK_FRAMEWORK_OBJC_KEY9 49 -+ -+extern "C" int pthread_key_init_np(int, void (*)(void *)); -+ - // Some libc functions call objc_msgSend() - // so we can't use them without deadlocks. - void syslog(int, const char *, ...) UNAVAILABLE_ATTRIBUTE; - void vsyslog(int, const char *, va_list) UNAVAILABLE_ATTRIBUTE; - -+#if defined(__i386__) || defined(__x86_64__) -+ -+// Inlined spinlock. -+// Not for arm on iOS because it hurts uniprocessor performance. -+ -+#define ARR_SPINLOCK_INIT 0 -+// XXX -- Careful: OSSpinLock isn't volatile, but should be -+typedef volatile int ARRSpinLock; -+__attribute__((always_inline)) -+static inline void ARRSpinLockLock(ARRSpinLock *l) -+{ -+ unsigned y; -+again: -+ if (__builtin_expect(__sync_lock_test_and_set(l, 1), 0) == 0) { -+ return; -+ } -+ for (y = 1000; y; y--) { -+#if defined(__i386__) || defined(__x86_64__) -+ asm("pause"); -+#endif -+ if (*l == 0) goto again; -+ } -+ thread_switch(THREAD_NULL, SWITCH_OPTION_DEPRESS, 1); -+ goto again; -+} -+__attribute__((always_inline)) -+static inline void ARRSpinLockUnlock(ARRSpinLock *l) -+{ -+ __sync_lock_release(l); -+} -+__attribute__((always_inline)) -+static inline int ARRSpinLockTry(ARRSpinLock *l) -+{ -+ return __sync_bool_compare_and_swap(l, 0, 1); -+} -+ -+#define spinlock_t ARRSpinLock -+#define spinlock_trylock(l) ARRSpinLockTry(l) -+#define spinlock_lock(l) ARRSpinLockLock(l) -+#define spinlock_unlock(l) ARRSpinLockUnlock(l) -+#define SPINLOCK_INITIALIZER ARR_SPINLOCK_INIT - --#define spinlock_t os_lock_handoff_s --#define spinlock_trylock(l) os_lock_trylock(l) --#define spinlock_lock(l) os_lock_lock(l) --#define spinlock_unlock(l) os_lock_unlock(l) --#define SPINLOCK_INITIALIZER OS_LOCK_HANDOFF_INIT -+#endif - - - #if !TARGET_OS_IPHONE --# include -+#define CRSetCrashLogMessage(msg) -+#define CRGetCrashLogMessage() 0 -+#define CRSetCrashLogMessage2(msg) - #else - // CrashReporterClient not yet available on iOS - __BEGIN_DECLS -@@ -594,21 +639,13 @@ - { - assert(is_valid_direct_key(k)); - -- if (_pthread_has_direct_tsd()) { -- return _pthread_getspecific_direct(k); -- } else { -- return pthread_getspecific(k); -- } -+ return pthread_getspecific(k); - } - static inline void tls_set_direct(tls_key_t k, void *value) - { - assert(is_valid_direct_key(k)); - -- if (_pthread_has_direct_tsd()) { -- _pthread_setspecific_direct(k, value); -- } else { -- pthread_setspecific(k, value); -- } -+ pthread_setspecific(k, value); - } - - // not arm diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 3c384ee359ef..f22b80a77682 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.83.1"; + version = "1.83.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-3EJAhjMEkQgyGMshCeV7Ci//tflEbhcOOFIdAsTIfh0="; + hash = "sha256-/oFzkC4I4fuHIaw6V6YyhmlHb/nGVeeqnawr3GjgAGw="; }; dontPatch = true; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 836a452b95f6..b1ad7ce0410c 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2024.06"; + version = "2024.09"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz"; - sha256 = "sha256-WByjKFu1aDeolUlT9inr3c5kQVK2c+zUu/rhUEMG19Y="; + sha256 = "sha256-6kfZn4E1kAjQdhi8oQPPePgthOlAv+lBoor+B8jLxiA="; }; dontFixup = true; # binaries must not be stripped or patchelfed diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dc3b43a4d19f..bdb0520f6a4b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,31 +32,31 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.1.110-hardened1.patch", - "sha256": "1v43n3h9d3y3xjjyf6r8n7a3fh3zpqw4f925bn2z5vwzblmg4bhf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.110-hardened1/linux-hardened-v6.1.110-hardened1.patch" + "name": "linux-hardened-v6.1.112-hardened1.patch", + "sha256": "1kna12dhs1csg2cd9ixm261pgnc44v7q67njd0z1mnjrk9q1y7n6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.112-hardened1/linux-hardened-v6.1.112-hardened1.patch" }, - "sha256": "0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly", - "version": "6.1.110" + "sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b", + "version": "6.1.112" }, "6.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.10.10-hardened1.patch", - "sha256": "13hlk1qd9inq711bz2sw4rq6r2lcagdl7mwxkx6rq8iimic758f2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.10-hardened1/linux-hardened-v6.10.10-hardened1.patch" + "name": "linux-hardened-v6.10.12-hardened1.patch", + "sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch" }, - "sha256": "1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6", - "version": "6.10.10" + "sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j", + "version": "6.10.12" }, "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.6.51-hardened1.patch", - "sha256": "03m82lylflnk466ixz3dywnj7scp6ynif4qhbx67ak3f0n44f738", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.51-hardened1/linux-hardened-v6.6.51-hardened1.patch" + "name": "linux-hardened-v6.6.53-hardened1.patch", + "sha256": "09i25qrn18psyrzr8srav4zcbyqmn2z8ycfk9fix2pdfxsaxl8h9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.53-hardened1/linux-hardened-v6.6.53-hardened1.patch" }, - "sha256": "1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w", - "version": "6.6.51" + "sha256": "0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98", + "version": "6.6.53" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 356135e46214..bc537d9c7b30 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,15 +20,15 @@ "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.53", - "hash": "sha256:0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98" + "version": "6.6.54", + "hash": "sha256:186ggr0yz7fgp05qav6k6j72aazvwdljdnf2zwb5q194dafqdbjz" }, "6.10": { - "version": "6.10.12", - "hash": "sha256:1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j" + "version": "6.10.13", + "hash": "sha256:0smimvnivdswiggplz9x65d03vdysgr3v9iijbk4f5fva0iypz2z" }, "6.11": { - "version": "6.11.1", - "hash": "sha256:0ggfg3f8nkcgs2pg7y5ccfrcjzj7j7x4n41g59gzbsp1nirj6dra" + "version": "6.11.2", + "hash": "sha256:0hlwsfq6brdkdcwdq6d1aq2b210hkqgpmy0y1sa5bfyfp6hgg7pc" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 070a5714ee83..a1cd2eb5d93f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.163-rt78"; # updated by ./update-rt.sh + version = "5.15.167-rt79"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2"; + sha256 = "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "030aycnrcnjhylkqj0wrfi992v2l26v17rgvxl16514zpdjmiv1x"; + sha256 = "0z9yhg0vxzrqn2vyg973pd8qy5iq30jkza8c0mrjjpjzyc8jvm57"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch b/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch deleted file mode 100644 index 2afea887428f..000000000000 --- a/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch +++ /dev/null @@ -1,197 +0,0 @@ -From b68e8356cf85fa75582237b4bc02f47efc40e8f0 Mon Sep 17 00:00:00 2001 -From: Picnoir -Date: Tue, 6 Aug 2024 11:43:34 +0200 -Subject: [PATCH] cargo.lock: bump time version - -Bumping time to 0.3.36. Fix the build for rustc > 1.80. - -Fix https://github.com/twosigma/nsncd/issues/118 ---- - Cargo.lock | 74 ++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 55 insertions(+), 19 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index a043bde..f6ce6f4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -205,6 +205,15 @@ version = "0.8.19" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", -+] -+ - [[package]] - name = "dirs-next" - version = "2.0.0" -@@ -426,6 +435,12 @@ dependencies = [ - "temp-env", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-derive" - version = "0.3.3" -@@ -434,7 +449,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -519,20 +534,26 @@ dependencies = [ - "plotters-backend", - ] - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "proc-macro2" --version = "1.0.64" -+version = "1.0.86" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" --version = "1.0.23" -+version = "1.0.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" - dependencies = [ - "proc-macro2", - ] -@@ -652,22 +673,22 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" - - [[package]] - name = "serde" --version = "1.0.154" -+version = "1.0.204" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" -+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.154" -+version = "1.0.204" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" -+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.72", - ] - - [[package]] -@@ -745,6 +766,17 @@ dependencies = [ - "unicode-ident", - ] - -+[[package]] -+name = "syn" -+version = "2.0.72" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ - [[package]] - name = "take_mut" - version = "0.2.2" -@@ -788,7 +820,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - ] - - [[package]] -@@ -803,11 +835,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.20" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", -+ "num-conv", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -815,16 +850,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.0" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.8" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -882,7 +918,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-shared", - ] - -@@ -904,7 +940,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index 4e0b76dac223..f235fa0646cb 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -3,26 +3,22 @@ stdenv, fetchFromGitHub, rustPlatform, + nix-update-script, + nixosTests, }: rustPlatform.buildRustPackage { pname = "nsncd"; - version = "1.4.1-unstable-2024-04-10"; + version = "1.4.1-unstable-2024-10-03"; src = fetchFromGitHub { owner = "twosigma"; repo = "nsncd"; - rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427"; - hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI="; + rev = "cf94e3cfc7dfff69867209c7e68945bac2d3913d"; + hash = "sha256-mjTbyO0b9i4LMv7DWHm0Y4z1pvcapCtFsHLV5cTAxQE="; }; - cargoHash = "sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo="; - - # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged. - cargoPatches = [ ./0001-cargo-bump.patch ]; - - # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged. - RUSTFLAGS = "-A dead_code"; + cargoHash = "sha256-cgdob/HmE6I59W5UQRItAFXDj7IvazNt99LbJlKQDNo="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" @@ -46,4 +42,9 @@ rustPlatform.buildRustPackage { # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; + + passthru = { + tests.nscd = nixosTests.nscd; + updateScript = nix-update-script { }; + }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 7d75db4a45b6..60588ea4f03a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -69,11 +69,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.71"; + version = "550.40.75"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-LDh3Kz7Iop+Y2rxXANuPPkDr6WKPuZ5KV9L3+RPa2d0="; - openSha256 = "sha256-0HGAE0SlQmEc75E0h7Oq7qu7rVfLhQoBqQF1OuHSa2Y="; + sha256_64bit = "sha256-Bgze1hx2gTKhchNHNVTnPnGOqpUe5UjNXJW5tVFi0wE="; + openSha256 = "sha256-NnJ3AxLWg90WjoZ81vzjII/UT2RaERF4IEZp5bRgElk="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index d83022930ad0..dcd78acb2631 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.gerbera.io/"; + changelog = "https://github.com/gerbera/gerbera/releases/tag/v${version}"; description = "UPnP Media Server for 2020"; longDescription = '' Gerbera is a Mediatomb fork. diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8ef2dda17da7..87af552c3575 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 = "2024.9.3"; + version = "2024.10.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -216,6 +216,8 @@ aprslib geopy ]; + "aps" = ps: with ps; [ + ]; "apsystems" = ps: with ps; [ apsystems-ez1 ]; @@ -284,6 +286,14 @@ pymicro-vad pyspeex-noise ]; + "assist_satellite" = ps: with ps; [ + ha-ffmpeg + hassil + home-assistant-intents + mutagen + pymicro-vad + pyspeex-noise + ]; "asuswrt" = ps: with ps; [ aioasuswrt pyasuswrt @@ -584,6 +594,9 @@ ]; "calendar" = ps: with ps; [ ]; + "cambridge_audio" = ps: with ps; [ + aiostreammagic + ]; "camera" = ps: with ps; [ pyturbojpeg ]; @@ -739,6 +752,10 @@ ]; "ddwrt" = ps: with ps; [ ]; + "deako" = ps: with ps; [ + ifaddr + zeroconf + ]; # missing inputs: pydeako "debugpy" = ps: with ps; [ debugpy ]; @@ -753,6 +770,7 @@ "default_config" = ps: with ps; [ aiodhcpwatcher aiodiscover + aiohasupervisor async-upnp-client av bleak @@ -932,6 +950,12 @@ ]; "duckdns" = ps: with ps; [ ]; + "duke_energy" = ps: with ps; [ + aiodukeenergy + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; "dunehd" = ps: with ps; [ pdunehd ]; @@ -946,6 +970,7 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ + aiohasupervisor dynalite-devices dynalite-panel home-assistant-frontend @@ -1365,6 +1390,7 @@ pyfronius ]; "frontend" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -1492,6 +1518,7 @@ gassist-text ]; "google_cloud" = ps: with ps; [ + google-cloud-speech google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ @@ -1511,6 +1538,9 @@ "google_maps" = ps: with ps; [ locationsharinglib ]; + "google_photos" = ps: with ps; [ + google-photos-library-api + ]; "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; @@ -1590,6 +1620,7 @@ habitipy ]; "hardkernel" = ps: with ps; [ + aiohasupervisor psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1602,6 +1633,7 @@ aioharmony ]; "hassio" = ps: with ps; [ + aiohasupervisor ]; "havana_shade" = ps: with ps; [ ]; @@ -1670,6 +1702,7 @@ "homeassistant_alerts" = ps: with ps; [ ]; "homeassistant_green" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1678,6 +1711,7 @@ zha ]; "homeassistant_hardware" = ps: with ps; [ + aiohasupervisor pillow pyserial pyudev @@ -1685,6 +1719,7 @@ zha ]; "homeassistant_sky_connect" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1693,6 +1728,7 @@ zha ]; "homeassistant_yellow" = ps: with ps; [ + aiohasupervisor pillow psutil-home-assistant pyserial @@ -1959,6 +1995,7 @@ "inspired_shades" = ps: with ps; [ ]; "insteon" = ps: with ps; [ + aiohasupervisor home-assistant-frontend insteon-frontend-home-assistant pillow @@ -2029,6 +2066,9 @@ "isal" = ps: with ps; [ isal ]; + "iskra" = ps: with ps; [ + pyiskra + ]; "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator-offline ]; @@ -2164,6 +2204,7 @@ knocki ]; "knx" = ps: with ps; [ + aiohasupervisor home-assistant-frontend knx-frontend pillow @@ -2243,6 +2284,7 @@ "lawn_mower" = ps: with ps; [ ]; "lcn" = ps: with ps; [ + aiohasupervisor home-assistant-frontend lcn-frontend pillow @@ -2324,6 +2366,9 @@ ]; "legrand" = ps: with ps; [ ]; + "lektrico" = ps: with ps; [ + lektricowifi + ]; "lg_netcast" = ps: with ps; [ ifaddr pylgnetcast @@ -2394,6 +2439,7 @@ "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ + aiohasupervisor fnv-hash-fast home-assistant-frontend pillow @@ -2424,6 +2470,7 @@ pyturbojpeg ]; "lovelace" = ps: with ps; [ + aiohasupervisor pillow ]; "luci" = ps: with ps; [ @@ -2462,6 +2509,7 @@ paho-mqtt_1 ]; "map" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -2671,6 +2719,8 @@ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; + "monarch_money" = ps: with ps; [ + ]; # missing inputs: typedmonarchmoney "monessen" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ @@ -2768,6 +2818,7 @@ mutesync ]; "my" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -2930,6 +2981,8 @@ "nx584" = ps: with ps; [ pynx584 ]; + "nyt_games" = ps: with ps; [ + ]; # missing inputs: nyt_games "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ @@ -2963,6 +3016,7 @@ omnilogic ]; "onboarding" = ps: with ps; [ + aiohasupervisor pillow ]; "oncue" = ps: with ps; [ @@ -3075,6 +3129,7 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otbr" = ps: with ps; [ + aiohasupervisor ifaddr pillow psutil-home-assistant @@ -3123,10 +3178,12 @@ pexpect ]; "panel_custom" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; "panel_iframe" = ps: with ps; [ + aiohasupervisor home-assistant-frontend pillow ]; @@ -3433,6 +3490,7 @@ zeroconf ]; "raspberry_pi" = ps: with ps; [ + aiohasupervisor psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3451,6 +3509,7 @@ sqlalchemy ]; "recovery_mode" = ps: with ps; [ + aiohasupervisor ha-ffmpeg hass-nabucasa hassil @@ -3517,8 +3576,7 @@ "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell - ] - ++ ring-doorbell.optional-dependencies.listen; + ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ @@ -3764,6 +3822,8 @@ sensorpush-ble zeroconf ]; + "sensoterra" = ps: with ps; [ + ]; # missing inputs: sensoterra "sentry" = ps: with ps; [ sentry-sdk ]; @@ -3897,6 +3957,8 @@ "smarttub" = ps: with ps; [ python-smarttub ]; + "smarty" = ps: with ps; [ + ]; # missing inputs: pysmarty2 "smhi" = ps: with ps; [ smhi-pkg ]; @@ -4242,8 +4304,6 @@ ]; # missing inputs: tessie-api "text" = ps: with ps; [ ]; - "tfiac" = ps: with ps; [ - ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ aioesphomeapi aioruuvigateway @@ -4296,9 +4356,6 @@ thermopro-ble zeroconf ]; - "thermoworks_smoke" = ps: with ps; [ - stringcase - ]; # missing inputs: thermoworks-smoke "thethingsnetwork" = ps: with ps; [ ttn-client ]; @@ -4449,6 +4506,8 @@ "trend" = ps: with ps; [ numpy_1 ]; + "triggercmd" = ps: with ps; [ + ]; # missing inputs: triggercmd "tts" = ps: with ps; [ ha-ffmpeg mutagen @@ -4678,6 +4737,9 @@ ]; "websocket_api" = ps: with ps; [ ]; + "weheat" = ps: with ps; [ + weheat + ]; "wemo" = ps: with ps; [ pywemo ]; @@ -4716,6 +4778,8 @@ "wled" = ps: with ps; [ wled ]; + "wmspro" = ps: with ps; [ + ]; # missing inputs: pywmspro "wolflink" = ps: with ps; [ ]; # missing inputs: wolf-comm "workday" = ps: with ps; [ @@ -4895,6 +4959,7 @@ "zeversolar" = ps: with ps; [ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ + aiohasupervisor pillow pyserial pyudev @@ -4982,6 +5047,7 @@ "arve" "aseko_pool_live" "assist_pipeline" + "assist_satellite" "asuswrt" "atag" "august" @@ -5028,6 +5094,7 @@ "button" "caldav" "calendar" + "cambridge_audio" "camera" "canary" "cast" @@ -5089,6 +5156,7 @@ "dsmr_reader" "dte_energy_bridge" "duckdns" + "duke_energy" "dunehd" "duotecno" "dwd_weather_warnings" @@ -5198,9 +5266,11 @@ "google" "google_assistant" "google_assistant_sdk" + "google_cloud" "google_domains" "google_generative_ai_conversation" "google_mail" + "google_photos" "google_pubsub" "google_sheets" "google_tasks" @@ -5291,6 +5361,7 @@ "iqvia" "iron_os" "isal" + "iskra" "islamic_prayer_times" "israel_rail" "ista_ecotrend" @@ -5324,6 +5395,7 @@ "lcn" "ld2410_ble" "led_ble" + "lektrico" "lg_netcast" "lg_soundbar" "lidarr" @@ -5770,6 +5842,7 @@ "webmin" "webostv" "websocket_api" + "weheat" "wemo" "whirlpool" "whois" diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index e9d67bd92d6c..1398dc0f2d7e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-LuljLjAljDn2hCMvdGpN27EzAxPl5Vnq4kIDVZ/8GV8="; + hash = "sha256-daxuvbjbnB1OZbvVGrA/jRe65x3MCXGFQ3o4L17Bgjk="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-trFOW3iJUm7jFLhDEjKqAkCJz5Pk4LqF4M6au1LjLzc="; + npmDepsHash = "sha256-AQYsXaZ4TyL8QjxOfub24NBxp0U6WMe+Czq+ooXwkIw="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4a4a6b8eed80..c22bfe4418b9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.9.3"; + hassVersion = "2024.10.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-W/qngUrc/R3lqdIWUFIXtP9IJ6t+VGdeAdJyZuGm94Q="; + hash = "sha256-X7atEjhw6QcS5xNiW+17/vrwqjCL4N3VocxUTELLXgo="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-Qp1AiB89sq1OrAVR7qLEfX1j8kW8L2lb4Z1x4z4AzP0="; + hash = "sha256-SHNs/zLyNVi0uGguRTWMnt9UpPYEFJbrfwBYFz+q5Nk="; }; build-system = with python.pkgs; [ @@ -457,6 +457,7 @@ in python.pkgs.buildPythonApplication rec { "sqlalchemy" "typing-extensions" "urllib3" + "uv" "yarl" ]; @@ -489,6 +490,7 @@ in python.pkgs.buildPythonApplication rec { dependencies = with python.pkgs; [ # Only packages required in pyproject.toml aiodns + aiohasupervisor aiohttp aiohttp-cors aiohttp-fast-zlib @@ -512,7 +514,6 @@ in python.pkgs.buildPythonApplication rec { orjson packaging pillow - pip psutil-home-assistant pyjwt pyopenssl @@ -523,6 +524,7 @@ in python.pkgs.buildPythonApplication rec { typing-extensions ulid-transform urllib3 + uv voluptuous voluptuous-openapi voluptuous-serialize @@ -530,8 +532,6 @@ in python.pkgs.buildPythonApplication rec { # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py pyotp pyqrcode - # Implicit dependency via homeassistant/requirements.py - packaging ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -587,6 +587,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_script.py::test_parallel_error" "--deselect=tests/helpers/test_script.py::test_propagate_error_service_not_found" "--deselect=tests/helpers/test_script.py::test_continue_on_error_automation_issue" + # checks whether pip is installed + "--deselect=tests/util/test_package.py::test_check_package_fragment" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b40c1e1e1fc6..d56630451d99 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 = "20240909.1"; + version = "20241002.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-inxDdsJQ58Jg+3bc382l8z/PbChWI0pfZR/k+wyexvE="; + hash = "sha256-9NqPBWcNM288ATdKH+Em0e9g2V2497YJLt8Wx5OL4+k="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 9442d1fbde28..a7360dd7e2e5 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.9.4"; + version = "2024.10.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-8wsszLbrOLvJJoXFHx40zJJbXKT6yNRS5Kgam9P8yGQ="; + hash = "sha256-bVKsZvQ4JhVpwILkRR/+lUzchBGwG2D4TTdBD7lDRcY="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 93b21249b886..da133b6a9c06 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.9.3"; + version = "2024.10.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-ohk0Gxq+q7PH/+SRMEu4KFz/xoc/TDeuEzTnMjaYMBU="; + hash = "sha256-CI8orK0iR8avP4zgdIo9EWa9G7fqAul9CF/rEZBqDbQ="; }; build-system = [ diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix index 22a50ea8feb6..b1134f7d3f3c 100644 --- a/pkgs/servers/http/apache-modules/mod_jk/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -1,36 +1,52 @@ -{ lib, stdenv, fetchurl, apacheHttpd, jdk }: +{ + lib, + stdenv, + apacheHttpd, + autoreconfHook, + fetchFromGitHub, + jdk, +}: stdenv.mkDerivation rec { pname = "mod_jk"; - version = "1.2.49"; + version = "1.2.50"; - src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz"; - hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; + src = fetchFromGitHub { + owner = "apache"; + repo = "tomcat-connectors"; + rev = "refs/tags/JK_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-hlwlx7Sb4oeZIzHQYOC3e9xEZK9u6ZG8Q2U/XdKMe3U="; }; + sourceRoot = "${src.name}/native"; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ + apacheHttpd + jdk + ]; + configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" "--with-java-home=${jdk}" ]; - setSourceRoot = '' - sourceRoot=$(echo */native) - ''; - installPhase = '' + runHook preInstall + mkdir -p $out/modules cp apache-2.0/mod_jk.so $out/modules + + runHook postInstall ''; - buildInputs = [ apacheHttpd jdk ]; - - meta = with lib; { + meta = { description = "Provides web server plugins to connect web servers with Tomcat"; homepage = "https://tomcat.apache.org/download-connectors.cgi"; changelog = "https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html"; - license = licenses.asl20; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anthonyroussel ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index fee5d15e112e..e917a9558ce3 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -59,12 +59,12 @@ let in { tomcat9 = common { - version = "9.0.94"; - hash = "sha256-KMjFSxBc6/qw196lxkwLJPV7N5efrB9p0C9Q0gPSPfA="; + version = "9.0.95"; + hash = "sha256-WzdanjSlywXfIYi/6eK2pve2kaPApiaytMBHxR1DQgU="; }; tomcat10 = common { - version = "10.1.29"; - hash = "sha256-k9klJ9Rn//CU1F2xyrvhos77kpeXeaRPKlDQU7QVXOM="; + version = "10.1.30"; + hash = "sha256-jeWoCPPcdirOZ5SM2Q0TJ7EWgWYiBE3IdQ8EIH35Ci4="; }; } diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index c95b4d764449..97c2dcde13f6 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,8 +1,8 @@ -{ buildGo121Module, fetchFromGitHub, lib }: +{ buildGo122Module, fetchFromGitHub, lib }: let generic = { subPackages, pname, postInstall ? "", mainProgram }: - buildGo121Module rec { + buildGo122Module rec { inherit pname; version = "6.11.0"; shortRev = "9587df6"; # for internal version info diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index e53e641e5d88..d7e03ab16cd4 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.13"; + version = "1.23.15"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-7JWn78gRLzuXuZjhTvjdJ7JVtLOtQ08zyokqkPdzYh0="; + hash = "sha256-/UAou+l7ppXU3t54YYdDZcXUNvEw7VGcn/OVPXdFdj0="; }; - npmDepsHash = "sha256-MKONzKCGYeMQK8JR9W9KiPLaqP/F0uAOzql4wZK4Sp4="; + npmDepsHash = "sha256-KaOnlqvfGatrdEqtw2Y0SudLuyzU6yC78DWn3+EZcec="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index beef1758422f..2a1d3fc6faba 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -55,5 +55,8 @@ buildGoModule rec { homepage = "https://zincsearch-docs.zinc.dev/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; + # Doesn't build with Go version later v1.21 (which is EOL). + # Upstream issue: https://github.com/zincsearch/zincsearch/issues/975 + broken = true; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 109876b6e9d2..aa62c778a3fd 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,7 +15,7 @@ protobufc, libiconv, libxslt, - docbook_xml_dtd_45, + docbook5, cunit, pcre2, nixosTests, @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "postgis"; - version = "3.4.3"; + version = "3.5.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I="; + hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA="; }; buildInputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" - substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd" # The test suite hardcodes it to use /tmp. export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" ''; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 191a8a0bc23b..c71f91e353e8 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.4"; + version = "2.14.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk="; + sha256 = "sha256-Xb8sby56U6Tc+OlxN7yKdhGGxrkmn6VfSPBhc1/YH24="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 0ace44e06f9d..db847297199b 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -14,13 +14,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.09.0"; + version = "24.10.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; + hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I="; }; strictDeps = true; diff --git a/pkgs/tools/X11/kdocker/default.nix b/pkgs/tools/X11/kdocker/default.nix index e8c08e4c3832..70b183aef58e 100644 --- a/pkgs/tools/X11/kdocker/default.nix +++ b/pkgs/tools/X11/kdocker/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Dock any application into the system tray"; homepage = "https://github.com/user-none/KDocker"; + changelog = "https://github.com/user-none/KDocker/blob/${finalAttrs.version}/ChangeLog"; license = licenses.gpl2Only; maintainers = with maintainers; [ hexclover ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix index 841f6073d56b..5fbcff2b2911 100644 --- a/pkgs/tools/X11/pmenu/default.nix +++ b/pkgs/tools/X11/pmenu/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Pie-menu tool"; homepage = "https://github.com/phillbush/pmenu"; + changelog = "https://github.com/phillbush/pmenu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; longDescription = '' Ļ€menu is a pie menu utility for X. Ļ€menu receives a menu specification in diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index 978f37abf699..5d867b598596 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-x53mS/nLRuxwDzYSwTtS+35OoDkO9ULTrdV7N43IQ/I="; + hash = "sha256-Wesnn52euV2z6nx6wSDho4R6Hu0dMKwGNvNT3MVxIg4="; }; - vendorHash = "sha256-p739VSwemwEh5siP9qChNQY76NHp7MsG3xAiBPZSvcs="; + vendorHash = "sha256-v8bBxyLysuiZ0ZheDt5juxaUGzL0PYLGTF5EymHzTOI="; ldflags = [ "-s" diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index a3d61f615b9d..8175b3a1da8a 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; homepage = "https://github.com/amadvance/advancecomp"; - + changelog = "https://github.com/amadvance/advancecomp/blob/v${version}/HISTORY"; }; } diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index e964f944d3a8..dfad444a3b71 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ ]; - # SMART is only supported on Linux and requires the smartmontools package postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/snapraid \ diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 8684c730b1a4..fae7c99b8a81 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; + changelog = "https://gitlab.freedesktop.org/mesa/adriconf/-/releases/v${version}"; description = "GUI tool used to configure open source graphics drivers"; license = licenses.gpl3Plus; maintainers = with maintainers; [ muscaln ]; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 469236e5b1db..ab505c4e3863 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-7JnNgTLpRo39EjYWchnfjGRfNgEwy5x4tUUzWT/d8h0="; + hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y="; }; - cargoHash = "sha256-ok+Bqtc6YJoCRFis8JRmtKs1Jag04Ged2J4p4trI2ls="; + cargoHash = "sha256-HmMAYtL0qoUrtLRKrYx6VZsc0bVRS+DhIFweLbz9l+w="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 62a3438b9bf6..3e60fbf4377f 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-gSXztee8tly8nNhcC4QcloOAgVpenWszg12w3thzKJ8="; + hash = "sha256-9v4A0mZjknc6a933b3ifPJo3xyem17Vpp0Wu0sUS0DM="; }; - cargoHash = "sha256-PaAhTSfw+enirVg9WHBpI+GjMwHA02/SiKkRa1A6QXc="; + cargoHash = "sha256-oCyvssTtUr8FR0XaFx2syxE8+zWXOGrf8kvQiBCyq18="; cargoBuildFlags = [ "-p=svg2pdf-cli" diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index da52cb1b6ea9..8b5dff5f5e33 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.42"; + version = "3.43"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-gGP+A8CfmXaAf5WEKYCU6ud93pzjeh9tU37SP0/TIzw="; + hash = "sha256-GwE/E8GgVIeZtCefLNvacDUxI2C+Uf8zgpOQ1NpiSmM="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index c4476317fe15..16472a5512dd 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; + changelog = "https://gitlab.com/interception/linux/tools/-/tags/v${version}"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.vyp ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 248538752d68..aba2d2f66c67 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { description = "Easy Hangul XIM"; mainProgram = "nabi"; homepage = "https://github.com/choehwanjin/nabi"; + changelog = "https://github.com/libhangul/nabi/blob/nabi-${version}/NEWS"; license = licenses.gpl2Plus; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/llm/gorilla-cli/default.nix b/pkgs/tools/llm/gorilla-cli/default.nix index 276793c2c8bc..b3e5a0fde509 100644 --- a/pkgs/tools/llm/gorilla-cli/default.nix +++ b/pkgs/tools/llm/gorilla-cli/default.nix @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "LLMs for your CLI"; homepage = "https://github.com/gorilla-llm/gorilla-cli"; + changelog = "https://github.com/gorilla-llm/gorilla-cli/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; mainProgram = "gorilla"; diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index f65dc392a2be..71ad738b8b92 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simple command-line interface for ChatGPT API"; homepage = "https://github.com/fuyufjh/heygpt"; + changelog = "https://github.com/fuyufjh/heygpt/releases/tag/v${version}"; license = licenses.mit; mainProgram = "heygpt"; maintainers = with maintainers; [aldoborrero]; diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/tools/misc/enjarify/default.nix index 4e4f21430132..37daac6c06b3 100644 --- a/pkgs/tools/misc/enjarify/default.nix +++ b/pkgs/tools/misc/enjarify/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { chmod +x $out/bin/enjarify ''; - buildInputs = [ ]; - meta = with lib; { description = "Tool for translating Dalvik bytecode to equivalent Java bytecode"; homepage = "https://github.com/google/enjarify/"; diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index 452ac6abc26d..2d142da60bc2 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - hash = "sha256-Ri0Os+/AqGWgf/2V5D7xvelOC3JTOMjNzjq56mhA3G4="; + hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ="; }; - cargoHash = "sha256-0+NYbVMIUarLppBZu6mtyGd+2fvkjEUq0TX7urBq3XI="; + cargoHash = "sha256-hgtSDPQRrqhQALqzVW8z9xXqIv+v5/Sbs6McrUCKiaU="; buildInputs = [ gmp mpfr libmpc ]; diff --git a/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock b/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock deleted file mode 100644 index daaa1802698f..000000000000 --- a/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock +++ /dev/null @@ -1,1212 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bluez-async" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce7d4413c940e8e3cb6afc122d3f4a07096aca259d286781128683fc9f39d9b" -dependencies = [ - "async-trait", - "bitflags 2.4.0", - "bluez-generated", - "dbus", - "dbus-tokio", - "futures", - "itertools", - "log", - "serde", - "serde-xml-rs", - "thiserror", - "tokio", - "uuid", -] - -[[package]] -name = "bluez-generated" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1c659dbc82f0b8ca75606c91a371e763589b7f6acf36858eeed0c705afe367" -dependencies = [ - "dbus", -] - -[[package]] -name = "btleplug" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ad24f1a9171b691da81fd0a0ae6859ef471979a4d68372515bafc2f4586df1" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bluez-async", - "cocoa", - "dashmap", - "dbus", - "futures", - "jni", - "jni-utils", - "libc", - "log", - "objc", - "once_cell", - "serde", - "serde_bytes", - "static_assertions", - "thiserror", - "tokio", - "tokio-stream", - "uuid", - "windows", -] - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap-verbosity-flag" -version = "2.1.1" -source = "git+https://github.com/ShayBoxs-Forks/clap-verbosity-flag.git#5807fd33f935a71ade25e2e6d5aa1b8727c8e63f" -dependencies = [ - "clap", - "tracing", -] - -[[package]] -name = "clap_builder" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "futures-channel", - "futures-util", - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dbus-tokio" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007688d459bc677131c063a3a77fb899526e17b7980f390b69644bdbc41fad13" -dependencies = [ - "dbus", - "libc", - "tokio", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jni-utils" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "259e9f2c3ead61de911f147000660511f07ab00adeed1d84f5ac4d0386e7a6c4" -dependencies = [ - "dashmap", - "futures", - "jni", - "log", - "once_cell", - "static_assertions", - "uuid", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "lighthouse" -version = "1.1.1" -dependencies = [ - "btleplug", - "clap", - "clap-verbosity-flag", - "serde", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "xml-rs" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 1898bfc7b295..90590d01cfdc 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -1,37 +1,38 @@ -{ stdenv, fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }: +{ + stdenv, + fetchFromGitHub, + lib, + rustPlatform, + pkg-config, + dbus, + AppKit, +}: rustPlatform.buildRustPackage rec { pname = "Lighthouse"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ShayBox"; repo = pname; rev = version; - sha256 = "0g0cs54j1vmcig5nc8sqgx30nfn2zjs40pvv30j5g9cyyszbzwkw"; + hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-verbosity-flag-2.1.1" = "1213bsb0bpvv6621j9zicjsqy05sv21gh6inrvszqwcmj6fxxc7j"; - }; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-XVPrtZNLdF9mKSl56kBepkpXRQBJsu9KlZRhb6BeG/E="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus ]; + buildInputs = [ dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 bddvlpr ]; + maintainers = with maintainers; [ + expipiplus1 + bddvlpr + ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index c3fa408aabed..428c235e394d 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY="; + hash = "sha256-7Wavhl5irQU9OV7+dslrIQEAcsaqJZ/jWmxaCyTBsEs="; }; - cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk="; + cargoHash = "sha256-WCbpwvCXm54/Cv+TscaqseWzTUd8V1DxmS30fUZZTwI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Very fast implementation of tldr in Rust"; homepage = "https://github.com/dbrgn/tealdeer"; - maintainers = with maintainers; [ davidak newam ]; + maintainers = with maintainers; [ davidak newam mfrw ]; license = with licenses; [ asl20 mit ]; mainProgram = "tldr"; }; diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/tools/networking/6tunnel/default.nix index 2f0e0320548b..b26853ee4ea1 100644 --- a/pkgs/tools/networking/6tunnel/default.nix +++ b/pkgs/tools/networking/6tunnel/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Tunnelling for application that don't speak IPv6"; mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; + changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog"; license = licenses.gpl2Only; maintainers = with maintainers; [ Br1ght0ne ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index f1864ed72dd2..e3c4210857e3 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://aria2.github.io"; + changelog = "https://github.com/aria2/aria2/releases/tag/release-${version}"; description = "Lightweight, multi-protocol, multi-source, command-line download utility"; mainProgram = "aria2c"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/bitmask-vpn/build_release.patch b/pkgs/tools/networking/bitmask-vpn/build_release.patch new file mode 100644 index 000000000000..ecb53f39e2e3 --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/build_release.patch @@ -0,0 +1,17 @@ +diff --git a/bitmask.pro b/bitmask.pro +index f377bb4..3c71a71 100644 +--- a/bitmask.pro ++++ b/bitmask.pro +@@ -4,9 +4,9 @@ QT += quickcontrols2 svg + CONFIG += qt staticlib + CONFIG += c++17 strict_c++ + CONFIG += qtquickcompiler +-CONFIG+=force_debug_info +-CONFIG+=debug_and_release +-#CONFIG+=release ++#CONFIG+=force_debug_info ++#CONFIG+=debug_and_release ++CONFIG+=release + windows:CONFIG -= console + unix:DEBUG:CONFIG += debug + lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5") \ No newline at end of file diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index 264bddf5b0f9..8a21a3b2f3eb 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -1,7 +1,7 @@ { lib , stdenv +, substituteAll , fetchFromGitLab -, mkDerivation , buildGoModule , wrapQtAppsHook , python3Packages @@ -13,32 +13,29 @@ , iproute2 , iptables , procps -, qmltermwidget , qtbase , qtdeclarative -, qtgraphicaleffects -, qtinstaller -, qtquickcontrols -, qtquickcontrols2 +, qtsvg , qttools +, qtwayland , CoreFoundation , Security , provider ? "riseup" }: let - version = "0.21.11"; + version = "0.24.8"; src = fetchFromGitLab { domain = "0xacab.org"; owner = "leap"; repo = "bitmask-vpn"; - rev = version; - sha256 = "sha256-mhmKG6Exxh64oeeeLezJYWEw61iIHLasHjLomd2L8P4="; + rev = "8b3ac473f64b6de0262fbf945ff25af8029134f1"; + sha256 = "sha256-nYMfO091w6H7LyY1+aYubFppg4/3GiZZm4e+0m9Gb3k="; }; # bitmask-root is only used on GNU/Linux # and may one day be replaced by pkg/helper - bitmask-root = mkDerivation { + bitmask-root = stdenv.mkDerivation { inherit src version; sourceRoot = "${src.name}/helpers"; pname = "bitmask-root"; @@ -70,6 +67,18 @@ buildGoModule rec { pname = "${provider}-vpn"; vendorHash = null; + patches = [ + # This patch fixes the paths in the build script generated by qmake + # to use the correct paths for qmlcachegen and lrelease + (substituteAll { + src = ./fix_paths.patch; + inherit qtbase qtdeclarative qttools; + }) + + # Don't build the debug version + ./build_release.patch + ]; + postPatch = '' substituteInPlace pkg/pickle/helpers.go \ --replace /usr/share $out/share @@ -77,7 +86,7 @@ buildGoModule rec { # Using $PROVIDER is not working, # thus replacing directly into the vendor.conf substituteInPlace providers/vendor.conf \ - --replace "provider = riseup" "provider = ${provider}" + --replace "provider = bitmask" "provider = ${provider}" substituteInPlace branding/templates/debian/app.desktop-template \ --replace "Icon=icon" "Icon=${pname}" @@ -87,7 +96,7 @@ buildGoModule rec { '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace pkg/helper/linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn - substituteInPlace pkg/vpn/launcher_linux.go \ + substituteInPlace pkg/launcher/launcher_linux.go \ --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \ --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \ --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \ @@ -98,21 +107,20 @@ buildGoModule rec { cmake pkg-config python3Packages.wrapPython - qmake - qtquickcontrols2 - qttools which wrapQtAppsHook - ] ++ lib.optional (!stdenv.hostPlatform.isLinux) qtinstaller; + qmake + qttools + qtsvg + ]; buildInputs = [ qtbase - qmltermwidget qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + # FIXME: building on Darwin currently fails # due to missing debug symbols for Qt, # this should be fixable once darwin.apple_sdk >= 10.13 @@ -123,13 +131,12 @@ buildGoModule rec { buildPhase = '' runHook preBuild - make gen_providers_json - make generate - # Remove timestamps in comments - sed -i -e '/^\/\//d' pkg/config/version/version.go + # TODO: this is a hack that copies the qrc file that should by built by qmlcachegen + # qmlcachegen is in qtdeclarative/libexec, but qmake is in qtbase/bin + # but qmake searches for qmlcachegen in qtbase/libexec which leads to the error + mkdir -p build/qt + cp ${./gui_gui_qmlcache.qrc} build/qt/gui_gui_qmlcache.qrc - # Not using -j$NIX_BUILD_CORES because the Makefile's rules - # are not thread-safe: lib/libgoshim.h is used before being built. make build runHook postBuild diff --git a/pkgs/tools/networking/bitmask-vpn/fix_paths.patch b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch new file mode 100644 index 000000000000..afc444952fbb --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/fix_paths.patch @@ -0,0 +1,13 @@ +diff --git a/gui/build.sh b/gui/build.sh +index a858a81..ac43f52 100755 +--- a/gui/build.sh ++++ b/gui/build.sh +@@ -94,6 +94,8 @@ function buildQmake { + mkdir -p $QTBUILD + $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH="${VENDOR_PATH}" $PROJECT + #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release ++ sed -i 's|@qtbase@/libexec/qmlcachegen|@qtdeclarative@/libexec/qmlcachegen|g' $QTBUILD/Makefile ++ sed -i 's|@qtbase@/bin/lrelease|@qttools@/bin/lrelease|g' $QTBUILD/Makefile + } + + function renameOutput { \ No newline at end of file diff --git a/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc b/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc new file mode 100644 index 000000000000..dd68f646d1fc --- /dev/null +++ b/pkgs/tools/networking/bitmask-vpn/gui_gui_qmlcache.qrc @@ -0,0 +1,107 @@ + + + + ../../gui/main.qml + ../../gui/qtquickcontrols2.conf + ../../gui/themes/themes.js + ../../gui/themes/theme-riseup.js + ../../gui/themes/Riseup.qml + ../../gui/themes/theme-calyx.js + ../../gui/themes/Calyx.qml + ../../gui/themes/Bitmask.qml + ../../gui/themes/ThemeObject.qml + ../../gui/components/MainView.qml + ../../gui/components/ThemedPage.qml + ../../gui/components/Splash.qml + ../../gui/components/FadeBehavior.qml + ../../gui/components/Home.qml + ../../gui/components/Header.qml + ../../gui/components/Footer.qml + ../../gui/components/About.qml + ../../gui/components/MaterialRadioButton.qml + ../../gui/components/MaterialRadioIndicator.qml + ../../gui/components/WrappedRadioButton.qml + ../../gui/components/MaterialCheckBox.qml + ../../gui/components/StatusBox.qml + ../../gui/components/Systray.qml + ../../gui/components/Help.qml + ../../gui/components/Locations.qml + ../../gui/components/SignalIcon.qml + ../../gui/components/Preferences.qml + ../../gui/components/BoldLabel.qml + ../../gui/components/LightLabel.qml + ../../gui/components/VPNButtonBase.qml + ../../gui/components/VPNMouseArea.qml + ../../gui/components/VerticalSpacer.qml + ../../gui/components/Icon.qml + ../../gui/components/VPNState.qml + ../../gui/components/InitErrors.qml + ../../gui/components/ErrorBox.qml + ../../gui/components/MotdBox.qml + ../../gui/resources/icon-noshield.svg + ../../gui/resources/location.svg + ../../gui/resources/settings.svg + ../../gui/resources/power.svg + ../../gui/resources/language.svg + ../../gui/resources/lightning.svg + ../../gui/resources/close.svg + ../../gui/resources/donate.svg + ../../gui/resources/tools.svg + ../../gui/resources/help.svg + ../../gui/resources/about.svg + ../../gui/resources/bridge.svg + ../../gui/resources/gear-fill.svg + ../../gui/resources/reception-0.svg + ../../gui/resources/reception-2.svg + ../../gui/resources/reception-4.svg + ../../gui/resources/reception-0@24.svg + ../../gui/resources/reception-4@24.svg + ../../gui/resources/arrow-left.svg + ../../gui/resources/globe.svg + ../../gui/resources/spy.gif + ../../gui/resources/quit.svg + ../../gui/resources/alert.svg + ../../gui/resources/angle-right.svg + ../../gui/resources/snowflake.svg + ../../gui/resources/button_green.png + ../../gui/resources/button_yellow.png + ../../gui/resources/button_red.png + ../../gui/resources/ravens.svg + ../../gui/resources/ravens.gif + ../../gui/resources/riseup-icon.svg + ../../gui/resources/riseup_connected_bg.png + ../../gui/resources/riseup_connecting_bg.png + ../../gui/resources/riseup_disconnected_bg.png + ../../gui/resources/riseup_green_shield.svg + ../../gui/resources/calyx/calyx-shield-green.png + ../../gui/resources/calyx/calyx-hand.png + ../../gui/resources/calyx/calyx-red-shield.png + ../../gui/resources/calyx/calyx-yellow-shield.png + ../../gui/resources/bitmask/splash_logo.png + ../../gui/resources/bitmask/state_connected.png + ../../gui/resources/bitmask/state_connecting.png + ../../gui/resources/bitmask/state_disconnected.png + ../../gui/resources/bitmask/bitmask_connected_bg.png + ../../gui/resources/bitmask/bitmask_connecting_bg.png + ../../gui/resources/bitmask/bitmask_disconnected_bg.png + ../../gui/resources/fonts/Poppins-Regular.ttf + ../../gui/resources/fonts/Poppins-Bold.ttf + ../../gui/resources/fonts/Montserrat-SemiBold.ttf + ../../gui/resources/fonts/Roboto-Regular.ttf + ../../gui/resources/fonts/Roboto-Bold.ttf + ../../gui/assets/icon/png/black/vpn_off.png + ../../gui/assets/icon/png/black/vpn_on.png + ../../gui/assets/icon/png/black/vpn_wait_0.png + ../../gui/assets/icon/png/black/vpn_wait_1.png + ../../gui/assets/icon/png/black/vpn_wait_2.png + ../../gui/assets/icon/png/black/vpn_wait_3.png + ../../gui/assets/icon/png/white/vpn_off.png + ../../gui/assets/icon/png/white/vpn_on.png + ../../gui/assets/icon/png/white/vpn_wait_0.png + ../../gui/assets/icon/png/white/vpn_wait_1.png + ../../gui/assets/icon/png/white/vpn_wait_2.png + ../../gui/assets/icon/png/white/vpn_wait_3.png + ../../gui/assets/img/bird.jpg + ../../gui/providers/providers.json + + diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 1fc91bf1f05a..e9c89657f803 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo121Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -37,7 +37,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo121Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index dad2af76964f..c5577a7bdccd 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -41,6 +41,8 @@ python3.pkgs.buildPythonApplication rec { "TestLoginUrl" "test_timeit2" # flakey, and depends sleep being precise to the milisecond "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux) + "test_markdown" # uses sys.version_info for conditional testing + "test_itms_services" # uses sys.version_info for conditional testing ]; disabledTestPaths = [ diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index d6a7648c445b..46501ca746ef 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; homepage = "https://secure.logmein.com/products/hamachi/"; + changelog = "https://support.logmeininc.com/central/help/whats-new-in-hamachi"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 9b0aa5cb899b..54819dd13827 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -22,6 +22,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; homepage = "https://github.com/mpscholten/maphosts"; + changelog = "https://github.com/mpscholten/maphosts/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/qcal/default.nix b/pkgs/tools/networking/qcal/default.nix index 12543a42dacb..9900f38faa05 100644 --- a/pkgs/tools/networking/qcal/default.nix +++ b/pkgs/tools/networking/qcal/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "CLI calendar application for CalDAV servers written in Go"; homepage = "https://git.sr.ht/~psic4t/qcal"; + changelog = "https://git.sr.ht/~psic4t/qcal/refs/${version}"; license = licenses.gpl3; mainProgram = "qcal"; maintainers = with maintainers; [ antonmosich ]; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 158cac0a734b..80349b170484 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation rec { version = "1.3.8rc1"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; src = fetchFromGitHub { owner = "sleinen"; diff --git a/pkgs/tools/package-management/akku/hardcode-libcurl.patch b/pkgs/tools/package-management/akku/hardcode-libcurl.patch deleted file mode 100644 index 7c5b8b50c320..000000000000 --- a/pkgs/tools/package-management/akku/hardcode-libcurl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- old/private/http.scm -+++ new/private/http.scm -@@ -101,14 +101,7 @@ - ;; shouldn't, but it's an old issue. - (log/error "Could not load libcurl. Please install the curl development(!) package.") - (exit 1))) -- (case (os-name) -- ((darwin) (set! libcurl (open-shared-object "libcurl.dylib"))) -- ((msys) (set! libcurl (open-shared-object "msys-curl-4"))) -- (else -- (guard (exn -- (else -- (set! libcurl (open-shared-object "libcurl.so.3")))) -- (set! libcurl (open-shared-object "libcurl.so.4")))))) -+ (set! libcurl (open-shared-object "@libcurl@"))) - (letrec () - (define %curl_global_init (foreign-procedure libcurl int curl_global_init (long))) - (call %curl_global_init #b11))) diff --git a/pkgs/tools/package-management/nix-serve/nix-command.patch b/pkgs/tools/package-management/nix-serve/nix-command.patch deleted file mode 100644 index 5bf8eaac8711..000000000000 --- a/pkgs/tools/package-management/nix-serve/nix-command.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9e434fff4486afeb3cc3f631f6dc56492b204704 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Wed, 31 Jul 2024 23:53:31 +0200 -Subject: [PATCH] add extra-experimental-features for nix-command - -fixes https://github.com/NixOS/nixpkgs/pull/331230 ---- - nix-serve.psgi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/nix-serve.psgi b/nix-serve.psgi -index 928fa3b..65a8680 100644 ---- a/nix-serve.psgi -+++ b/nix-serve.psgi -@@ -64,7 +64,7 @@ my $app = sub { - return [404, ['Content-Type' => 'text/plain'], ["Incorrect NAR hash. Maybe the path has been recreated.\n"]] - unless $narHash eq "sha256:$expectedNarHash"; - my $fh = new IO::Handle; -- open $fh, "-|", "nix", "dump-path", "--", $storePath; -+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; - return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; - } - -@@ -75,14 +75,14 @@ my $app = sub { - return [404, ['Content-Type' => 'text/plain'], ["No such path.\n"]] unless $storePath; - my ($deriver, $narHash, $time, $narSize, $refs) = $store->queryPathInfo($storePath, 1) or die; - my $fh = new IO::Handle; -- open $fh, "-|", "nix", "dump-path", "--", $storePath; -+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath; - return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh]; - } - - elsif ($path =~ /^\/log\/([0-9a-z]+-[0-9a-zA-Z\+\-\.\_\?\=]+)/) { - my $storePath = "$Nix::Config::storeDir/$1"; - my $fh = new IO::Handle; -- open $fh, "-|", "nix", "log", $storePath; -+ open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "log", $storePath; - return [200, ['Content-Type' => 'text/plain' ], $fh]; - } - diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/tools/security/adreaper/default.nix index 4e7c554e9164..bf5bb470f3ec 100644 --- a/pkgs/tools/security/adreaper/default.nix +++ b/pkgs/tools/security/adreaper/default.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Enumeration tool for Windows Active Directories"; homepage = "https://github.com/AidenPearce369/ADReaper"; + changelog = "https://github.com/AidenPearce369/ADReaper/releases/tag/ADReaperv${version}"; # Upstream doesn't have a license yet # https://github.com/AidenPearce369/ADReaper/issues/2 license = with licenses; [ unfree ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index a9e973f8d00d..c6ca1a21ef60 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -200,6 +200,7 @@ let and improvements from the community ''; homepage = "https://aflplus.plus"; + changelog = "https://aflplus.plus/docs/changelog"; license = lib.licenses.asl20; platforms = [ "x86_64-linux" diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index a2b5d31c8538..6abfd72864f2 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://aide.github.io/"; + changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog"; description = "File and directory integrity checker"; mainProgram = "aide"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/tools/security/cameradar/default.nix index 2182fe3b0b7b..dae3565813c6 100644 --- a/pkgs/tools/security/cameradar/default.nix +++ b/pkgs/tools/security/cameradar/default.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = with lib; { description = "RTSP stream access tool"; homepage = "https://github.com/Ullaakut/cameradar"; + changelog = "https://github.com/Ullaakut/cameradar/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; # Upstream issue, doesn't build with latest curl, see diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 7d416cbdb6f8..e8ffe7b2e410 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-wTtHdPrGTzDSqkgKMROs772y3mc0X2jMguDZOAL6Ypw="; + hash = "sha256-+UZ1o9rkbk/RnyU2Vzzs7uIm+texl5kGa+qt88x4zuk="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-7HaDsLZsO7QIFiUBE4kH1av97EE+zwphPRusFfpMxUc="; + vendorHash = "sha256-E1QHLh2gg5RZ7+tl7eJNR2FmtfVI6rwI6qLD7tio18c="; subPackages = [ "cmd/cosign" diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index b898147d9a21..b9a756dd597c 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.1.2"; + version = "11.2"; releaseName = "NIX"; distroPrefix = "ghidra_${version}_${releaseName}"; @@ -28,7 +28,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-FL1nLaq8A9PI+RzqZg5+O+4+ZsH16MG3cf7OIKimDqw="; + hash = "sha256-iO6g3t8JNdc/wAC+JG+6Y7aZCq7T9zYQC3KKZcr+wzc="; # 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; diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json index 8e45b569a916..e4b3795d929e 100644 --- a/pkgs/tools/security/ghidra/deps.json +++ b/pkgs/tools/security/ghidra/deps.json @@ -10,9 +10,6 @@ "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": { "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io=" }, - "2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any": { - "whl": "sha256-gc8eM91mfdIX3FahIzJnluZ5m4Vp8sbvt4wWN1yvmys=" - }, "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": { "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA=" }, @@ -28,6 +25,9 @@ "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": { "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8=" }, + "ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any": { + "whl": "sha256-7aXubE6HOQKYG39SW0KgJCi4fHNo3yxb3+He0OaIQSY=" + }, "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": { "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU=" } @@ -38,37 +38,37 @@ } }, "https://github.com": { - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x64": { "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x86": { "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x64": { "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x86": { "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x64": { "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x86": { "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x64": { "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x86": { "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x64": { "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x86": { "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/lib/java-sarif-2.1-modified": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/lib/java-sarif-2.1-modified": { "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" }, "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": { @@ -742,8 +742,8 @@ "pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": { "zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk=" }, - "yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09": { - "zip": "sha256-Ta5zKlNYRq5d+rdT6CpNX5OtmgWgZeIXK7l3ShsVRTo=" + "yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12": { + "zip": "sha256-xvxZgV04ANFOyXeSaor9P2BqDr100s/WBgFndGbt6qI=" } }, "https://storage.googleapis.com": { diff --git a/pkgs/tools/security/ghidra/extensions.nix b/pkgs/tools/security/ghidra/extensions.nix index cae5b38c0e92..60070a316a0f 100644 --- a/pkgs/tools/security/ghidra/extensions.nix +++ b/pkgs/tools/security/ghidra/extensions.nix @@ -11,6 +11,8 @@ lib.makeScope newScope (self: { buildGhidraScripts ; + findcrypt = self.callPackage ./extensions/findcrypt { }; + ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { }; ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension { diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix new file mode 100644 index 000000000000..e6d5918f9f1b --- /dev/null +++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + buildGhidraExtension, +}: +let + version = "3.0.1"; +in +buildGhidraExtension { + pname = "findcrypt"; + inherit version; + + src = fetchFromGitHub { + owner = "antoniovazquezblanco"; + repo = "GhidraFindcrypt"; + rev = "v${version}"; + hash = "sha256-/KA95NdoQFvR6XSGCHkX+ySKfftK84hJ8zjAvt0+O0o="; + }; + + meta = { + description = "Ghidra analysis plugin to locate cryptographic constants"; + homepage = "https://github.com/antoniovazquezblanco/GhidraFindcrypt"; + downloadPage = "https://github.com/antoniovazquezblanco/GhidraFindcrypt/releases/tag/v${version}"; + changelog = "https://github.com/antoniovazquezblanco/GhidraFindcrypt/releases/tag/v${version}"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.BonusPlay ]; + }; +} diff --git a/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix b/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix index e2ab50c119c1..e7791eb90b2b 100644 --- a/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ret-sync/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildGhidraExtension, ghidra, }: @@ -14,7 +15,16 @@ buildGhidraExtension { rev = "0617c75746ddde7fe2bdbbf880175af8ad27553e"; hash = "sha256-+G5ccdHnFL0sHpueuIYwLRU9FhzN658CYqQCHCBwxV4="; }; - + patches = [ + # This patch is needed to get the extension compiling with Ghidra 11.2. + # Once it's fixed upstream, the src can be updated and this can be removed. + (fetchpatch { + # https://github.com/bootleg/ret-sync/pull/126 + name = "ghidra-11.2-fix.patch"; + url = "https://github.com/bootleg/ret-sync/commit/d81d953c24b4369b499e90ba64c1c9f78513a008.patch"; + hash = "sha256-t/voPcBfsZtfdYnskgBAPfqMTBw1LRTT0aXyyb5qtr8="; + }) + ]; preConfigure = '' cd ext_ghidra ''; diff --git a/pkgs/tools/security/s5/default.nix b/pkgs/tools/security/s5/default.nix index 007e61c2fd52..85aca4e60dc6 100644 --- a/pkgs/tools/security/s5/default.nix +++ b/pkgs/tools/security/s5/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "s5"; - version = "0.1.13"; + version = "0.1.15"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - hash = "sha256-asX61mGgXKlSvVGcGrfVGLiZersjbaVql1eKf+b9JmU="; + hash = "sha256-QQMnzDRWdW0awwNx2vqtzrOW9Ua7EmJ9YFznQoK33J0="; }; - vendorHash = "sha256-8nuhRoFnN2oiJdo7bXxHqaHTkZH9Hh2Q2cYnMkEt4kI="; + vendorHash = "sha256-axcZ4XzgsPVU9at/g3WS8Hv92P2hmZRb+tUfw+h9iH0="; subPackages = [ "cmd/${pname}" ]; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 3ca39e21c2bc..4e892c13af3f 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sops"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "getsops"; repo = pname; rev = "v${version}"; - hash = "sha256-Q1e3iRIne9/bCLxKdhzP3vt3oxuHJAuG273HdeHZ3so="; + hash = "sha256-j16hSTi7fwlMu8hwHqCR0lW22VSf0swIVTF81iUYl2k="; }; - vendorHash = "sha256-3vzKQZTg38/UGVJ/M1jLALCgor7wztsLKVuMqY3adtI="; + vendorHash = "sha256-40YESkLSKL/zFBI7ccz0ilrl9ATr74YpvRNrOpzJDew="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index 4b3757ae7673..0d3d312cea43 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -21,6 +21,7 @@ bundlerApp { meta = with lib; { description = "Black box WordPress vulnerability scanner"; homepage = "https://wpscan.org/"; + changelog = "https://github.com/wpscanteam/wpscan/releases"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ nyanloutre manveru ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/tools/security/xcat/default.nix index bb5fc62831e7..54219f1e1ac4 100644 --- a/pkgs/tools/security/xcat/default.nix +++ b/pkgs/tools/security/xcat/default.nix @@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { and directories. ''; homepage = "https://github.com/orf/xcat"; + changelog = "https://github.com/orf/xcat/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 57ea989021b8..01439e6aa49b 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m"; }; - buildInputs = [ ]; - meta = with lib; { description = "Enhanced version of GNU dd"; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 2344602a276c..9a545a7f3f31 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; homepage = "https://github.com/theZiz/aha"; + changelog = "https://github.com/theZiz/aha/blob/${version}/CHANGELOG"; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ pSub ]; platforms = platforms.all; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 68e5b9c7ddca..d7ef55154805 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -2,13 +2,13 @@ gccStdenv.mkDerivation rec { pname = "boxes"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "ascii-boxes"; repo = "boxes"; rev = "v${version}"; - hash = "sha256-/gc/5vDflmEwOtQbtLwRcchyr22rLQcWqs5GrwRxY70="; + hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk="; }; # Building instructions: diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 8e0f8f7a8d6d..4b36b32fe0a2 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , installShellFiles , git @@ -7,18 +7,18 @@ , d2 }: -buildGoModule rec { +buildGo123Module rec { pname = "d2"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SAejVwqTa/yV1pAIltAkX25KxITfkbzP9SGcLQdPUCg="; + hash = "sha256-HD59q4GFrkjLvQQdYGA7ISwXJztweRxoV5AWbHinTx8="; }; - vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ="; + vendorHash = "sha256-HcWyhQFRI+dvOhUrVaL9U5PvL/CDBpaOYPXSkYzIYf4="; excludedPackages = [ "./e2etests" ]; @@ -48,7 +48,9 @@ buildGoModule rec { meta = with lib; { description = "Modern diagram scripting language that turns text to diagrams"; + mainProgram = "d2"; homepage = "https://d2lang.com"; + changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ dit7ya kashw2 ]; }; diff --git a/pkgs/tools/text/jen/default.nix b/pkgs/tools/text/jen/default.nix index a29b2e905803..decc88434dd8 100644 --- a/pkgs/tools/text/jen/default.nix +++ b/pkgs/tools/text/jen/default.nix @@ -1,20 +1,30 @@ -{ lib -, rustPlatform -, fetchCrate -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchCrate, + fetchpatch, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { pname = "jen"; - version = "1.6.0"; + version = "1.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-fpv/IzU23yAz1cumTbdQP6wHJX2U4acNxq8Zrx+YQVs="; + hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; }; - cargoHash = "sha256-LKiPG7k5UgaESP1ShsIWNMnm9resbRje746txOBo+Qs="; + cargoPatches = [ + (fetchpatch { + name = "fix-rust-1.80-build.patch"; + url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch"; + hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E="; + }) + ]; + + cargoHash = "sha256-Y81YqrzJSar0BxhQb7Vm/cZ9E6krlyZesXPY+j37IHA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/tools/wayland/gtklock/playerctl-module.nix b/pkgs/tools/wayland/gtklock/playerctl-module.nix index 5bc5237d75e8..ac3c31ca0a03 100644 --- a/pkgs/tools/wayland/gtklock/playerctl-module.nix +++ b/pkgs/tools/wayland/gtklock/playerctl-module.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "Gtklock module adding power controls to the lockscreen"; - homepage = "https://github.com/jovanlanik/gtklock-powerbar-module"; + description = "Gtklock module adding media player controls to the lockscreen"; + homepage = "https://github.com/jovanlanik/gtklock-playerctl-module"; license = licenses.gpl3Only; maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77d940eb55a..45e23ccda809 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3175,8 +3175,6 @@ with pkgs; iamy = callPackage ../tools/admin/iamy { }; - iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; - azeret-mono = callPackage ../data/fonts/azeret-mono { }; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; @@ -4454,8 +4452,6 @@ with pkgs; wlroots = wlroots_0_17; }; - swaykbdd = callPackage ../tools/wayland/swaykbdd { }; - swayr = callPackage ../tools/wayland/swayr { }; swayrbar = callPackage ../tools/wayland/swayrbar { }; @@ -5365,8 +5361,6 @@ with pkgs; krapslog = callPackage ../tools/misc/krapslog { }; - krelay = callPackage ../applications/networking/cluster/krelay { }; - krill = callPackage ../servers/krill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7056,8 +7050,6 @@ with pkgs; driftctl = callPackage ../applications/networking/cluster/driftctl { }; - eks-node-viewer = callPackage ../applications/networking/cluster/eks-node-viewer { }; - drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10950,8 +10942,6 @@ with pkgs; ovftool = callPackage ../tools/virtualization/ovftool { }; - overcommit = callPackage ../development/tools/overcommit { }; - overmind = callPackage ../applications/misc/overmind { }; oxker = callPackage ../applications/misc/oxker { }; @@ -11580,7 +11570,7 @@ with pkgs; ripdrag = callPackage ../tools/misc/ripdrag { }; - riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -14147,7 +14137,7 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; zincsearch = callPackage ../servers/search/zincsearch { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; }; zkfuse = callPackage ../tools/filesystems/zkfuse { }; @@ -14508,7 +14498,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - inherit (coqPackages_8_19) compcert; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { @@ -16773,39 +16763,11 @@ with pkgs; guile = guile_3_0; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; - - guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; - - guile-config = callPackage ../development/guile-modules/guile-config { }; - - guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; - - guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { }; - - guile-git = callPackage ../development/guile-modules/guile-git { }; - - guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { }; - - guile-json = callPackage ../development/guile-modules/guile-json { }; - - guile-lib = callPackage ../development/guile-modules/guile-lib { }; - - guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; - - guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; - - guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; - guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; - - guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; - - guile-xcb = callPackage ../development/guile-modules/guile-xcb { + guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix { guile = guile_2_2; }; @@ -17456,8 +17418,6 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cobra-cli = callPackage ../development/tools/cobra-cli { }; - cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { inherit cmake cmake-format; }; @@ -17851,9 +17811,8 @@ with pkgs; guff = callPackage ../tools/graphics/guff { }; - guile-hall = callPackage ../development/tools/guile/guile-hall { }; - - gwrap = callPackage ../development/tools/guile/g-wrap { + gwrap = g-wrap; + g-wrap = callPackage ../by-name/g-/g-wrap/package.nix { guile = guile_2_2; }; @@ -20083,8 +20042,6 @@ with pkgs; pgweb = callPackage ../development/tools/database/pgweb { }; - granted = callPackage ../tools/admin/granted { }; - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -23972,17 +23929,6 @@ with pkgs; buildGoModule = buildGo122Module; buildGoPackage = buildGo122Package; - # requires a newer Apple SDK - go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; - }; - buildGo121Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_21; - }; - buildGo121Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_21; - }; - # requires a newer Apple SDK go_1_22 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.22.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; @@ -30712,8 +30658,6 @@ with pkgs; kubeconform = callPackage ../applications/networking/cluster/kubeconform { }; - kubecolor = callPackage ../applications/networking/cluster/kubecolor { }; - kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; kuttl = callPackage ../applications/networking/cluster/kuttl { }; @@ -30724,16 +30668,10 @@ with pkgs; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; - kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; - kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; - kubectl-ktop = callPackage ../applications/networking/cluster/kubectl-ktop { }; - kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; - kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; - kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -30964,7 +30902,9 @@ with pkgs; lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; + lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -31778,10 +31718,6 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nchat = callPackage ../applications/networking/instant-messengers/nchat { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; - }; - nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; @@ -32960,8 +32896,6 @@ with pkgs; syncthing-discovery syncthing-relay; - stc-cli = callPackage ../applications/networking/stc-cli { }; - syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { # renamed in KF5 -> KF6 plasma-framework = kdePackages.libplasma; @@ -34780,16 +34714,7 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; - chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { - libplacebo = libplacebo.overrideAttrs (old: { - version = "6.338.2-unstable-2024-01-29"; - src = old.src.override { - # broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9 - rev = "c320f61e601caef2be081ce61138e5d51c1be21d"; - hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE="; - }; - }); - }; + chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { }; clonehero = callPackage ../games/clonehero { }; @@ -38221,8 +38146,6 @@ with pkgs; jx = callPackage ../applications/networking/cluster/jx { }; - pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; - tagref = callPackage ../tools/misc/tagref { }; tcat = callPackage ../tools/misc/tcat { }; @@ -38883,8 +38806,6 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - yor = callPackage ../applications/networking/cluster/yor { }; - wifi-password = callPackage ../os-specific/darwin/wifi-password { }; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e26247c259f2..78749813f9fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -207,6 +207,8 @@ self: super: with self; { aiodocker = callPackage ../development/python-modules/aiodocker { }; + aiodukeenergy = callPackage ../development/python-modules/aiodukeenergy { }; + aioeafm = callPackage ../development/python-modules/aioeafm { }; aioeagle = callPackage ../development/python-modules/aioeagle { }; @@ -1675,6 +1677,8 @@ self: super: with self; { blackrenderer = callPackage ../development/python-modules/blackrenderer { }; + blake3 = callPackage ../development/python-modules/blake3 { }; + bleach = callPackage ../development/python-modules/bleach { }; bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; @@ -5266,6 +5270,8 @@ self: super: with self; { google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { }; + google-photos-library-api = callPackage ../development/python-modules/google-photos-library-api { }; + googlemaps = callPackage ../development/python-modules/googlemaps { }; google-pasta = callPackage ../development/python-modules/google-pasta { }; @@ -6987,6 +6993,8 @@ self: super: with self; { igraph-c = pkgs.igraph; }; + lektricowifi = callPackage ../development/python-modules/lektricowifi { }; + leveldb = callPackage ../development/python-modules/leveldb { }; levenshtein = callPackage ../development/python-modules/levenshtein { }; @@ -10196,6 +10204,8 @@ self: super: with self; { pyisemail = callPackage ../development/python-modules/pyisemail { }; + pyiskra = callPackage ../development/python-modules/pyiskra { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pyixapi = callPackage ../development/python-modules/pyixapi { };