diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7cdd0738a1fdb..4714b843f2034 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -186,3 +186,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # fetchurl: nixfmt-rfc-style ce21e97a1f20dee15da85c084f9d1148d84f853b + +# percona: apply nixfmt +8d14fa2886fec877690c6d28cfcdba4503dbbcea diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a31d9898d74db..2081aea73f2d1 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -175,6 +175,8 @@ - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). +- [saunafs](https://saunafs.com) Distributed POSIX file system. Available as [services.saunafs](options.html#opt-services.saunafs). + - [obs-studio](https://obsproject.com/), Free and open source software for video recording and live streaming. Available as [programs.obs-studio.enable](#opt-programs.obs-studio.enable). - [Veilid](https://veilid.com), a headless server that enables privacy-focused data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable). @@ -187,6 +189,9 @@ - The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. +- The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`. + This change does not affect the override interface of most Python packages, as [`.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute. + - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). @@ -227,6 +232,11 @@ Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}..extraArgs`, that those might have been removed or modified upstream. +- `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. + +- Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated. + - `percona-server` and `percona-server_lts` now point towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling. + - `clang-tools_` packages have been moved into `llvmPackages_` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`). - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`. - Top-level `clang_tools_` attributes are now aliases; these will be removed in a future release. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6f5357382dc56..233555cb6eee5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -965,6 +965,7 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba-wsdd.nix ./services/network-filesystems/samba.nix + ./services/network-filesystems/saunafs.nix ./services/network-filesystems/tahoe.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/webdav-server-rs.nix diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 20186016afd70..c1e5f8cf43e19 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -186,7 +186,8 @@ in { http.docRoot = lib.mkOption { type = with lib.types; nullOr path; - default = null; + default = pkgs.snapweb; + defaultText = lib.literalExpression "pkgs.snapweb"; description = '' Path to serve from the HTTP servers root. ''; diff --git a/nixos/modules/services/network-filesystems/saunafs.nix b/nixos/modules/services/network-filesystems/saunafs.nix new file mode 100644 index 0000000000000..5c3c513c06f76 --- /dev/null +++ b/nixos/modules/services/network-filesystems/saunafs.nix @@ -0,0 +1,287 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.saunafs; + + settingsFormat = + let + listSep = " "; + allowedTypes = with lib.types; [ + bool + int + float + str + ]; + valueToString = + val: + if lib.isList val then + lib.concatStringsSep listSep (map (x: valueToString x) val) + else if lib.isBool val then + (if val then "1" else "0") + else + toString val; + + in + { + type = + let + valueType = + lib.types.oneOf ( + [ + (lib.types.listOf valueType) + ] + ++ allowedTypes + ) + // { + description = "Flat key-value file"; + }; + in + lib.types.attrsOf valueType; + + generate = + name: value: + pkgs.writeText name ( + lib.concatStringsSep "\n" (lib.mapAttrsToList (key: val: "${key} = ${valueToString val}") value) + ); + }; + + initTool = pkgs.writeShellScriptBin "sfsmaster-init" '' + if [ ! -e ${cfg.master.settings.DATA_PATH}/metadata.sfs ]; then + cp --update=none ${pkgs.saunafs}/var/lib/saunafs/metadata.sfs.empty ${cfg.master.settings.DATA_PATH}/metadata.sfs + chmod +w ${cfg.master.settings.DATA_PATH}/metadata.sfs + fi + ''; + + # master config file + masterCfg = settingsFormat.generate "sfsmaster.cfg" cfg.master.settings; + + # metalogger config file + metaloggerCfg = settingsFormat.generate "sfsmetalogger.cfg" cfg.metalogger.settings; + + # chunkserver config file + chunkserverCfg = settingsFormat.generate "sfschunkserver.cfg" cfg.chunkserver.settings; + + # generic template for all daemons + systemdService = name: extraConfig: configFile: { + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} start"; + ExecStop = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} stop"; + ExecReload = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} reload"; + } // extraConfig; + }; + +in +{ + ###### interface + + options = { + services.saunafs = { + masterHost = lib.mkOption { + type = lib.types.str; + default = null; + description = "IP or hostname name of master host."; + }; + + sfsUser = lib.mkOption { + type = lib.types.str; + default = "saunafs"; + description = "Run daemons as user."; + }; + + client.enable = lib.mkEnableOption "Saunafs client"; + + master = { + enable = lib.mkOption { + type = lib.types.bool; + description = '' + Enable Saunafs master daemon. + + You need to run `sfsmaster-init` on a freshly installed master server to + initialize the `DATA_PATH` directory. + ''; + default = false; + }; + + exports = lib.mkOption { + type = with lib.types; listOf str; + default = null; + description = "Paths to exports file (see {manpage}`sfsexports.cfg(5)`)."; + example = lib.literalExpression '' + [ "* / rw,alldirs,admin,maproot=0:0" ]; + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/master"; + description = "Data storage directory."; + }; + }; + + description = "Contents of config file ({manpage}`sfsmaster.cfg(5)`)."; + }; + }; + + metalogger = { + enable = lib.mkEnableOption "Saunafs metalogger daemon"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/metalogger"; + description = "Data storage directory"; + }; + }; + + description = "Contents of metalogger config file (see {manpage}`sfsmetalogger.cfg(5)`)."; + }; + }; + + chunkserver = { + enable = lib.mkEnableOption "Saunafs chunkserver daemon"; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + hdds = lib.mkOption { + type = with lib.types; listOf str; + default = null; + + example = lib.literalExpression '' + [ "/mnt/hdd1" ]; + ''; + + description = '' + Mount points to be used by chunkserver for storage (see {manpage}`sfshdd.cfg(5)`). + + Note, that these mount points must writeable by the user defined by the saunafs user. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/chunkserver"; + description = "Directory for chunck meta data"; + }; + }; + + description = "Contents of chunkserver config file (see {manpage}`sfschunkserver.cfg(5)`)."; + }; + }; + }; + }; + + ###### implementation + + config = + lib.mkIf (cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable) + { + + warnings = [ + (lib.mkIf (cfg.sfsUser == "root") "Running saunafs services as root is not recommended.") + ]; + + # Service settings + services.saunafs = { + master.settings = lib.mkIf cfg.master.enable { + WORKING_USER = cfg.sfsUser; + EXPORTS_FILENAME = toString ( + pkgs.writeText "sfsexports.cfg" (lib.concatStringsSep "\n" cfg.master.exports) + ); + }; + + metalogger.settings = lib.mkIf cfg.metalogger.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + }; + + chunkserver.settings = lib.mkIf cfg.chunkserver.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + HDD_CONF_FILENAME = toString ( + pkgs.writeText "sfshdd.cfg" (lib.concatStringsSep "\n" cfg.chunkserver.hdds) + ); + }; + }; + + # Create system user account for daemons + users = + lib.mkIf + (cfg.sfsUser != "root" && (cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable)) + { + users."${cfg.sfsUser}" = { + isSystemUser = true; + description = "saunafs daemon user"; + group = "saunafs"; + }; + groups."${cfg.sfsUser}" = { }; + }; + + environment.systemPackages = + (lib.optional cfg.client.enable pkgs.saunafs) ++ (lib.optional cfg.master.enable initTool); + + networking.firewall.allowedTCPPorts = + (lib.optionals cfg.master.openFirewall [ + 9419 + 9420 + 9421 + ]) + ++ (lib.optional cfg.chunkserver.openFirewall 9422); + + # Ensure storage directories exist + systemd.tmpfiles.rules = + lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -"; + + # Service definitions + systemd.services.sfs-master = lib.mkIf cfg.master.enable ( + systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "no"; + } masterCfg + ); + + systemd.services.sfs-metalogger = lib.mkIf cfg.metalogger.enable ( + systemdService "metalogger" { Restart = "on-abort"; } metaloggerCfg + ); + + systemd.services.sfs-chunkserver = lib.mkIf cfg.chunkserver.enable ( + systemdService "chunkserver" { Restart = "on-abort"; } chunkserverCfg + ); + }; +} diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 145b4ad1dd3f1..d174edb0fc93e 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -337,6 +337,7 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" + "@chown" ] ++ optionals (cfg.enableXDP) [ "bpf" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6c207a2758bac..2903e59329c01 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -889,6 +889,7 @@ in { samba-wsdd = handleTest ./samba-wsdd.nix {}; sane = handleTest ./sane.nix {}; sanoid = handleTest ./sanoid.nix {}; + saunafs = handleTest ./saunafs.nix {}; scaphandre = handleTest ./scaphandre.nix {}; schleuder = handleTest ./schleuder.nix {}; scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {}; diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index ad54b0e00c1b3..079eff163b1cf 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ inherit (pkgs) mysql80; }; perconaPackages = { - inherit (pkgs) percona-server_lts percona-server_innovation; + inherit (pkgs) percona-server_8_0 percona-server_8_4; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 6b8ed50a2f19e..777c00f74e228 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -132,10 +132,6 @@ let client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") - with subtest("Wait until we have received the nameservers"): - client.wait_until_succeeds("grep -q 2001:db8::1 /etc/resolv.conf") - client.wait_until_succeeds("grep -q 192.168.2.1 /etc/resolv.conf") - with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix index 70d28fe96380b..bd989408df8a1 100644 --- a/nixos/tests/networking/networkmanager.nix +++ b/nixos/tests/networking/networkmanager.nix @@ -121,7 +121,6 @@ let static.wait_for_unit("NetworkManager.service") dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'") - dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '2001:db8::1'") static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'") static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'") ''; diff --git a/nixos/tests/networking/router.nix b/nixos/tests/networking/router.nix index fab21c9e78624..e0ad7fa01591a 100644 --- a/nixos/tests/networking/router.nix +++ b/nixos/tests/networking/router.nix @@ -72,7 +72,6 @@ AdvSendAdvert on; AdvManagedFlag on; AdvOtherConfigFlag on; - RDNSS 2001:db8::1 {}; prefix fd00:1234:5678:${toString n}::/64 { AdvAutonomous off; diff --git a/nixos/tests/saunafs.nix b/nixos/tests/saunafs.nix new file mode 100644 index 0000000000000..49d9861757166 --- /dev/null +++ b/nixos/tests/saunafs.nix @@ -0,0 +1,122 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + master = + { pkgs, ... }: + { + # data base is stored in memory + # server may crash with default memory size + virtualisation.memorySize = 1024; + + services.saunafs.master = { + enable = true; + openFirewall = true; + exports = [ + "* / rw,alldirs,maproot=0:0" + ]; + }; + }; + + chunkserver = + { pkgs, ... }: + { + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + fileSystems = pkgs.lib.mkVMOverride { + "/data" = { + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; + + services.saunafs = { + masterHost = "master"; + chunkserver = { + openFirewall = true; + enable = true; + hdds = [ "/data" ]; + + # The test image is too small and gets set to "full" + settings.HDD_LEAVE_SPACE_DEFAULT = "100M"; + }; + }; + }; + + metalogger = + { pkgs, ... }: + { + services.saunafs = { + masterHost = "master"; + metalogger.enable = true; + }; + }; + + client = + { pkgs, lib, ... }: + { + services.saunafs.client.enable = true; + # systemd.tmpfiles.rules = [ "d /sfs 755 root root -" ]; + systemd.network.enable = true; + + # Use networkd to have properly functioning + # network-online.target + networking = { + useDHCP = false; + useNetworkd = true; + }; + + systemd.mounts = [ + { + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "remote-fs.target" ]; + type = "saunafs"; + what = "master:/"; + where = "/sfs"; + } + ]; + }; + + in + { + name = "saunafs"; + + meta.maintainers = [ lib.maintainers.markuskowa ]; + + nodes = { + inherit master metalogger; + chunkserver1 = chunkserver; + chunkserver2 = chunkserver; + client1 = client; + client2 = client; + }; + + testScript = '' + # prepare master server + master.start() + master.wait_for_unit("multi-user.target") + master.succeed("sfsmaster-init") + master.succeed("systemctl restart sfs-master") + master.wait_for_unit("sfs-master.service") + + metalogger.wait_for_unit("sfs-metalogger.service") + + # Setup chunkservers + for chunkserver in [chunkserver1, chunkserver2]: + chunkserver.wait_for_unit("multi-user.target") + chunkserver.succeed("chown saunafs:saunafs /data") + chunkserver.succeed("systemctl restart sfs-chunkserver") + chunkserver.wait_for_unit("sfs-chunkserver.service") + + for client in [client1, client2]: + client.wait_for_unit("multi-user.target") + + client1.succeed("echo test > /sfs/file") + client2.succeed("grep test /sfs/file") + ''; + } +) diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 25ab4f7c6b71c..7899e408068fa 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniaudicle"; - version = "1.5.2.0"; + version = "1.5.3.0"; src = fetchFromGitHub { owner = "ccrma"; repo = "miniAudicle"; rev = "chuck-${finalAttrs.version}"; - hash = "sha256-jpPF2Qx/6tiotsj92m1XmxsEUgtm5029ijpu3O8B9qM="; + hash = "sha256-iLmTliJXaYDM5X+s3HsXLFO2qonh18BaiWiTdDXKWjk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 84924fe42e5ad..fc77ac423b0ec 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -217,6 +217,7 @@ in preview-tailor = mkHome super.preview-tailor; + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73325 psgml = ignoreCompilationError super.psgml; # elisp error # native-ice https://github.com/mattiase/relint/issues/15 diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index ed745d5708a8b..f72d1da79b64b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -757,15 +757,20 @@ let # https://github.com/gongo/airplay-el/issues/2 airplay = addPackageRequires super.airplay [ self.request-deferred ]; - # https://github.com/melpa/melpa/pull/9185 - alectryon = super.alectryon.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --recursive --verbose etc/elisp/screenshot - ''; - }); + alectryon = super.alectryon.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9185 + preBuild = + if lib.versionOlder finalAttrs.version "20241006.1902" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --recursive --verbose etc/elisp/screenshot + '' + else + previousAttrs.preBuild or null; + } + ); # https://github.com/gergelypolonkai/alert-termux/issues/2 alert-termux = addPackageRequires super.alert-termux [ self.alert ]; @@ -803,15 +808,20 @@ let # missing optional dependencies boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ]; - # https://github.com/melpa/melpa/pull/9181 - bpr = super.bpr.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --verbose --force test-bpr.el - ''; - }); + bpr = super.bpr.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9181 + preBuild = + if lib.versionOlder finalAttrs.version "20241013.1803" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose --force test-bpr.el + '' + else + previousAttrs; + } + ); bts = ignoreCompilationError super.bts; # elisp error @@ -853,13 +863,19 @@ let # one optional dependency spark is removed in https://github.com/melpa/melpa/pull/9151 chronometrist = ignoreCompilationError super.chronometrist; - # https://github.com/melpa/melpa/pull/9184 - chronometrist-key-values = super.chronometrist-key-values.overrideAttrs (old: { - recipe = '' - (chronometrist-key-values :fetcher git :url "" - :files (:defaults "elisp/chronometrist-key-values.*")) - ''; - }); + chronometrist-key-values = super.chronometrist-key-values.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9184 + recipe = + if lib.versionOlder finalAttrs.version "20241006.1831" then + '' + (chronometrist-key-values :fetcher git :url "" + :files (:defaults "elisp/chronometrist-key-values.*")) + '' + else + previousAttrs.recipe; + } + ); clingo-mode = super.clingo-mode.overrideAttrs ( finalAttrs: previousAttrs: { @@ -1072,15 +1088,20 @@ let fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error - # https://github.com/melpa/melpa/pull/9182 - frontside-javascript = super.frontside-javascript.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --verbose packages/javascript/test-suppport.el - ''; - }); + frontside-javascript = super.frontside-javascript.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9182 + preBuild = + if lib.versionOlder finalAttrs.version "20240929.1858" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose packages/javascript/test-suppport.el + '' + else + previousAttrs.preBuild or null; + } + ); fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d183730963b5d..485283b46b00c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18636,5 +18636,15 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - + leetcode-nvim = buildVimPlugin { + pname = "leetcode.nvim"; + version = "2024-06-27"; + src = fetchFromGitHub { + owner = "kawre"; + repo = "leetcode.nvim"; + rev = "02fb2c855658ad6b60e43671f6b040c812181a1d"; + sha256 = "sha256-YoFRd9Uf+Yv4YM6/l7MVLMjfRqhroSS3RCmZvNowIAo="; + }; + meta.homepage = "https://github.com/kawre/leetcode.nvim/"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3addfab294593..1d5a0e7cd3658 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2651,6 +2651,17 @@ in nvimRequireCheck = "yazi"; }; + leetcode-nvim = super.leetcode-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + telescope-nvim + ]; + + doInstallCheck = true; + nvimRequireCheck = "leetcode"; + }; + YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index be41e83a655a8..c4d547e962e44 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -475,6 +475,7 @@ https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, https://github.com/ggandor/leap-ast.nvim/,HEAD, https://github.com/ggandor/leap.nvim/,HEAD, +https://github.com/kawre/leetcode.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, https://github.com/thirtythreeforty/lessspace.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 17eb87f0c17e4..d46dd4269c382 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1644,8 +1644,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.24.0"; - hash = "sha256-zNiKtOeZEO9zVpyF4AE/3FjiEy4jtCSCjB9T8e8PjRE="; + version = "0.24.1"; + hash = "sha256-C6p5IBJ6aKH2/AainIBwIWTPEALtHMkAd9+QnFCzA7c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index f75ddf0c108de..7e96b34af40ad 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; + hash = "sha256-ORTFddzVGKXpy5V6zXJgCnwLwn/8cWKklpcoHkc6u34="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 897881dec46ce..6e0fc3a0fb4ab 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.88.1"; + version = "0.88.2"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ="; + sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q="; }; postPatch = '' diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index b235cabde9981..ac8e15d389080 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.5"; + version = "1.27.6"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; + hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 32c307af60257..b4151a9c5095c 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, glibcLocales -, installShellFiles -, python3 +{ + lib, + stdenv, + fetchFromGitHub, + glibcLocales, + installShellFiles, + python3, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/pimutils/khal/issues/1361 + icalendar = super.icalendar.overridePythonAttrs (old: rec { + version = "5.0.13"; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + }; + patches = [ ]; + build-system = with self; [ setuptools ]; + dependencies = with self; [ + python-dateutil + pytz + ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "khal"; version = "0.11.3"; pyproject = true; @@ -18,16 +41,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; }; + build-system = with python.pkgs; [ + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ glibcLocales installShellFiles - ] ++ (with python3.pkgs; [ - setuptools-scm - sphinx - sphinxcontrib-newsfeed - ]); + ]; - propagatedBuildInputs = with python3.pkgs;[ + dependencies = with python.pkgs; [ atomicwrites click click-log @@ -45,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python3.pkgs;[ + nativeCheckInputs = with python.pkgs; [ freezegun hypothesis packaging @@ -61,8 +85,15 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ - make -C doc man + PATH="${ + python3.withPackages ( + ps: with ps; [ + sphinx + sphinxcontrib-newsfeed + ] + ) + }/bin:$PATH" \ + make -C doc man installManPage doc/build/man/khal.1 # .desktop file @@ -71,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = !stdenv.hostPlatform.isAarch64; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; disabledTests = [ # timing based diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 903839049d0d6..daf10d19c5298 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.6.5"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple"; rev = "refs/tags/${version}"; - hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI="; + hash = "sha256-RFLxDV/L6Qbz14KqIEcMX/EnirNUrHL0MW8v5Z8ByK0="; }; build-system = with python3Packages; [ setuptools ]; @@ -36,11 +36,6 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 ]; - pythonRelaxDeps = [ - "skytemple-files" - "skytemple-ssb-debugger" - ]; - dependencies = with python3Packages; [ cairosvg natsort @@ -49,7 +44,6 @@ python3Packages.buildPythonApplication rec { pycairo pygal psutil - gbulb pypresence sentry-sdk setuptools diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index ffc69b514713f..c030a86e0a93e 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-tSMaDb8lflkedDa5ICXthqMpWBkHg+UQ20aTrF4+hUQ="; + hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs="; }; - vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc="; + vendorHash = "sha256-Cz+w0tOEamCxf61hvQ03X/kXPY+qrmdBN8s26lr/wZ8="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 2030a3f467b4b..1b4ae2a4e74a0 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -57,6 +57,7 @@ let homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + knownVulnerabilities = [ "CVE-2024-6775" ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 487b13e557058..21234f5a34f48 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.6.1"; - revision = "204"; + version = "9.7.2"; + revision = "205"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew=="; + hash = "sha512-LihbkFIFpulewNIHl1oiXJF1npuqNLvVjN8CAmDDf46PAXdpaiMMluHWIJ4NljAACh6d4Uw6m2pKgEDfFN1y6g=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index eae9e424857f0..75adb0425cc97 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,30 +1,32 @@ -{ lib -, fetchFromGitHub -, glibcLocales -, installShellFiles -, jq -, python3 +{ + fetchFromGitHub, + installShellFiles, + jq, + lib, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "todoman"; version = "4.4.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "pimutils"; - repo = pname; + repo = "todoman"; rev = "refs/tags/v${version}"; hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; nativeBuildInputs = [ installShellFiles - ] ++ (with python3.pkgs; [ + ]; + + build-system = with python3.pkgs; [ setuptools-scm - ]); + ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ atomicwrites click click-log @@ -34,22 +36,18 @@ python3.pkgs.buildPythonApplication rec { parsedatetime python-dateutil pyxdg + pytz tabulate urwid ]; nativeCheckInputs = with python3.pkgs; [ - flake8 - flake8-import-order freezegun hypothesis pytestCheckHook - glibcLocales pytest-cov-stub ]; - LC_ALL = "en_US.UTF-8"; - postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " @@ -87,9 +85,14 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${ + builtins.replaceStrings [ "." ] [ "-" ] version + }"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ leenaars antonmosich ]; + maintainers = with lib.maintainers; [ + leenaars + antonmosich + ]; mainProgram = "todo"; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 36535678a8d6a..e22bef1541b2a 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.0"; + version = "7.22.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE="; + hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index d2ee518883b54..66fc2152a4e7f 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-8P3aa5hjTSlGAolIwiAlPhCg8nx/pfJJE7ZbOsbLsEU="; + sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U="; }; buildInputs = [ diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/applications/system/supergfxctl/default.nix index 3fd0182e66a22..2318a4c96725f 100644 --- a/pkgs/applications/system/supergfxctl/default.nix +++ b/pkgs/applications/system/supergfxctl/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "supergfxctl"; - version = "5.2.1"; + version = "5.2.4"; src = fetchFromGitLab { owner = "asus-linux"; repo = "supergfxctl"; rev = version; - hash = "sha256-gjMLyT3pvQhmjz9SFbYlDAqg+tCX5ORkCkcnyBzO5ws="; + hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; }; - cargoHash = "sha256-ndugyiAYPDyue2Ajxx22BNvYc9iBTxZqP5OxaqmC7U0="; + cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9b4b7f2ae0197..033870a4e4212 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.8", - "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag", + "version": "17.2.9", + "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.8-ee", + "rev": "v17.2.9-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.8", - "GITLAB_PAGES_VERSION": "17.2.8", + "GITALY_SERVER_VERSION": "17.2.9", + "GITLAB_PAGES_VERSION": "17.2.9", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.8" + "GITLAB_WORKHORSE_VERSION": "17.2.9" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 3fe22d7050f03..45f5914852db9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.8"; + version = "17.2.9"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE="; + hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index e30dcebfd6978..7fb674689237a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc="; + hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ef6709b945402..235ddbf54aed5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index e1e39918436b8..82bef8d819d29 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -1,7 +1,9 @@ { go, cacert, git, lib, stdenv }: { name ? "${args'.pname}-${args'.version}" + # The source used to build the derivation. , src + # Native build inputs used for the derivation. , nativeBuildInputs ? [ ] , passthru ? { } , patches ? [ ] @@ -9,48 +11,52 @@ # A function to override the goModules derivation , overrideModAttrs ? (finalAttrs: previousAttrs: { }) - # path to go.mod and go.sum directory + # Directory to the `go.mod` and `go.sum` relative to the `src`. , modRoot ? "./" - # vendorHash is the SRI hash of the vendored dependencies - # - # if vendorHash is null, then we won't fetch any dependencies and - # rely on the vendor folder within the source. + # The SRI hash of the vendored dependencies. + # If `vendorHash` is `null`, no dependencies are fetched and + # the build relies on the vendor folder within the source. , vendorHash ? throw ( if args'?vendorSha256 then "buildGoModule: Expect vendorHash instead of vendorSha256" else "buildGoModule: vendorHash is missing" ) + # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false + # Whether to fetch (go mod download) and proxy the vendor directory. # This is useful if your code depends on c code and go mod tidy does not # include the needed sources to build or if any dependency has case-insensitive # conflicts which will produce platform dependant `vendorHash` checksums. , proxyVendor ? false - # We want parallel builds by default + # We want parallel builds by default. , enableParallelBuilding ? true # Do not enable this without good reason - # IE: programs coupled with the compiler + # IE: programs coupled with the compiler. , allowGoReference ? false + # Go env. variable to enable CGO. , CGO_ENABLED ? go.CGO_ENABLED + # Meta data for the final derivation. , meta ? { } - # Not needed with buildGoModule + # Not needed with `buildGoModule`. , goPackagePath ? "" + # Go linker flags. , ldflags ? [ ] - + # Go build flags. , GOFLAGS ? [ ] - # needed for buildFlags{,Array} warning -, buildFlags ? "" -, buildFlagsArray ? "" + # Needed for buildFlags{,Array} warning +, buildFlags ? "" # deprecated +, buildFlagsArray ? "" # deprecated , ... }@args': @@ -79,7 +85,7 @@ in inherit (go) GOOS GOARCH; inherit GO111MODULE GOTOOLCHAIN; - # The following inheritence behavior is not trivial to expect, and some may + # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and # out in the wild. In anycase, it's documented in: # doc/languages-frameworks/go.section.md @@ -323,7 +329,7 @@ in } // passthru; meta = { - # Add default meta information + # Add default meta information. platforms = go.meta.platforms or lib.platforms.all; } // meta; } diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 88a3dc8fc5021..eb025a0a969d4 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.6.0"; + version = "2.6.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = "refs/tags/${version}"; - hash = "sha256-XXxfbchQ1l6L8KflqjlGIiyRbG/dI5ok0ExlROavXYg="; + hash = "sha256-tXUM2XxYXUTXsycfq0hmkzc4quHKh7+0qit1YuKdCeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 479f6d69d736d..16217b9f3fd6a 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -6,7 +6,8 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.1"; + version = "7.0.2"; + pyproject = true; disabled = python3.pythonOlder "3.10"; @@ -14,9 +15,13 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Zjo8H5PU6JezrBF0XBHvmePUTNeX74BX4NsHtPozcKs="; + hash = "sha256-QmZX5I1D1iYUQ6Ll0tkbpjzqaOIBaGAltKHwUqLB6uk="; }; + build-system = with python3.pkgs; [ + setuptools + ]; + dependencies = with python3.pkgs; [ dbus-python icalendar diff --git a/pkgs/by-name/cl/cloak-pt/package.nix b/pkgs/by-name/cl/cloak-pt/package.nix index ec797d0d60c6e..bcd3441bb43fe 100644 --- a/pkgs/by-name/cl/cloak-pt/package.nix +++ b/pkgs/by-name/cl/cloak-pt/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.9.0"; + version = "2.10.0"; in buildGoModule { pname = "Cloak"; @@ -14,10 +14,10 @@ buildGoModule { owner = "cbeuw"; repo = "Cloak"; rev = "v${version}"; - hash = "sha256-IclSnSJAUSWWAk8UZbUJLMVcnoZk5Yvsd1n3u67cM2g="; + hash = "sha256-JbwjsLVOxQc6v47+6rG2f1JLS8ieZI6jYV/twtaVx9M="; }; - vendorHash = "sha256-kkb/gPnDbJvfc5Qqc5HuM1c9OwOu1ijfO7nNNnY3mOo="; + vendorHash = "sha256-0veClhg9GujI5VrHVzAevIXkjqtZ6r7RGTP2QeWbO2w="; doCheck = false; diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix index 75b6c83295f58..467f7987d8ca4 100644 --- a/pkgs/by-name/el/elektroid/package.nix +++ b/pkgs/by-name/el/elektroid/package.nix @@ -14,7 +14,7 @@ }: let - version = "3.0.1"; + version = "3.1"; in stdenv.mkDerivation { inherit version; @@ -25,7 +25,7 @@ stdenv.mkDerivation { owner = "dagargo"; repo = "elektroid"; rev = version; - hash = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4="; + hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch b/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch new file mode 100644 index 0000000000000..0119e5c20adf6 --- /dev/null +++ b/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch @@ -0,0 +1,889 @@ +From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sat, 28 Sep 2024 10:09:27 +0800 +Subject: [PATCH] update Cargo.lock + +--- + Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 254 insertions(+), 211 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 6829f6f..8ae6c05 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2,6 +2,15 @@ + # It is not intended for manual editing. + version = 3 + ++[[package]] ++name = "aho-corasick" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "atty" + version = "0.2.14" +@@ -15,48 +24,42 @@ dependencies = [ + + [[package]] + name = "autocfg" +-version = "1.0.1" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "bstr" +-version = "0.2.16" ++name = "bumpalo" ++version = "3.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +-dependencies = [ +- "lazy_static", +- "memchr", +- "regex-automata", +- "serde", +-] ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + + [[package]] +-name = "bumpalo" +-version = "3.7.0" ++name = "byteorder" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "cast" +-version = "0.2.7" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +-dependencies = [ +- "rustc_version", +-] ++checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + + [[package]] + name = "cc" +-version = "1.0.69" ++version = "1.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" ++checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cfg-if" +@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "2.33.3" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "bitflags", + "textwrap", +@@ -77,16 +80,16 @@ dependencies = [ + + [[package]] + name = "criterion" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" + dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", +- "itertools 0.10.1", ++ "itertools", + "lazy_static", + "num-traits", + "oorandom", +@@ -103,65 +106,45 @@ dependencies = [ + + [[package]] + name = "criterion-plot" +-version = "0.4.3" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" + dependencies = [ + "cast", +- "itertools 0.9.0", +-] +- +-[[package]] +-name = "crossbeam-channel" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +-dependencies = [ +- "cfg-if", +- "crossbeam-utils", ++ "itertools", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.8.0" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" + dependencies = [ +- "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.5" ++version = "0.9.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" + dependencies = [ +- "cfg-if", + "crossbeam-utils", +- "lazy_static", +- "memoffset", +- "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.5" ++version = "0.8.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +-dependencies = [ +- "cfg-if", +- "lazy_static", +-] ++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + + [[package]] + name = "csv" +-version = "1.1.6" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" ++checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" + dependencies = [ +- "bstr", + "csv-core", + "itoa", + "ryu", +@@ -170,9 +153,9 @@ dependencies = [ + + [[package]] + name = "csv-core" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" + dependencies = [ + "memchr", + ] +@@ -192,9 +175,9 @@ dependencies = [ + + [[package]] + name = "either" +-version = "1.6.1" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + + [[package]] + name = "fcp" +@@ -208,9 +191,9 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.3" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "libc", +@@ -219,9 +202,9 @@ dependencies = [ + + [[package]] + name = "half" +-version = "1.7.1" ++version = "1.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + + [[package]] + name = "hermit-abi" +@@ -234,78 +217,66 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.9.0" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +-dependencies = [ +- "either", +-] +- +-[[package]] +-name = "itertools" +-version = "0.10.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ + "either", + ] + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" ++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" + dependencies = [ + "wasm-bindgen", + ] + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libc" +-version = "0.2.98" ++version = "0.2.159" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" ++checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + + [[package]] + name = "log" +-version = "0.4.14" ++version = "0.4.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +-dependencies = [ +- "cfg-if", +-] ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memoffset" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "nix" +-version = "0.22.0" ++version = "0.22.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" ++checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" + dependencies = [ + "bitflags", + "cc", +@@ -316,34 +287,30 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] + + [[package]] +-name = "num_cpus" +-version = "1.13.0" ++name = "once_cell" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +-dependencies = [ +- "hermit-abi", +- "libc", +-] ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "oorandom" +-version = "11.1.3" ++version = "11.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + + [[package]] + name = "plotters" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" ++checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" + dependencies = [ + "num-traits", + "plotters-backend", +@@ -354,53 +321,55 @@ dependencies = [ + + [[package]] + name = "plotters-backend" +-version = "0.3.2" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" ++checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + + [[package]] + name = "plotters-svg" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" ++checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" + dependencies = [ + "plotters-backend", + ] + + [[package]] + name = "ppv-lite86" +-version = "0.2.10" ++version = "0.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "proc-macro2" +-version = "1.0.27" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "rand" +-version = "0.8.4" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", + "rand_chacha", + "rand_core", +- "rand_hc", + ] + + [[package]] +@@ -415,22 +384,13 @@ dependencies = [ + + [[package]] + name = "rand_core" +-version = "0.6.3" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ + "getrandom", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +-dependencies = [ +- "rand_core", +-] +- + [[package]] + name = "rand_pcg" + version = "0.3.1" +@@ -442,64 +402,58 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.5.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" ++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.1" ++version = "1.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" ++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" + dependencies = [ +- "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "lazy_static", +- "num_cpus", + ] + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" + dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", + "regex-syntax", + ] + + [[package]] + name = "regex-automata" +-version = "0.1.10" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" ++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] + + [[package]] + name = "regex-syntax" +-version = "0.6.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +- +-[[package]] +-name = "rustc_version" +-version = "0.4.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +-dependencies = [ +- "semver", +-] ++checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + + [[package]] + name = "ryu" +-version = "1.0.5" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + + [[package]] + name = "same-file" +@@ -510,32 +464,20 @@ dependencies = [ + "winapi-util", + ] + +-[[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "semver" +-version = "1.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +- + [[package]] + name = "serde" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_cbor" +-version = "0.11.1" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" + dependencies = [ + "half", + "serde", +@@ -543,9 +485,9 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +@@ -554,24 +496,31 @@ dependencies = [ + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.128" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" + dependencies = [ + "itoa", ++ "memchr", + "ryu", + "serde", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "syn" +-version = "1.0.73" ++version = "2.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" ++checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -594,53 +543,53 @@ dependencies = [ + ] + + [[package]] +-name = "unicode-width" +-version = "0.1.8" ++name = "unicode-ident" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] +-name = "unicode-xid" +-version = "0.2.2" ++name = "unicode-width" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + + [[package]] + name = "walkdir" +-version = "2.3.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" + dependencies = [ + "same-file", +- "winapi", + "winapi-util", + ] + + [[package]] + name = "wasi" +-version = "0.10.2+wasi-snapshot-preview1" ++version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" ++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" + dependencies = [ + "cfg-if", ++ "once_cell", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" ++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", +@@ -649,9 +598,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" ++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -659,9 +608,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" ++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" + dependencies = [ + "proc-macro2", + "quote", +@@ -672,15 +621,15 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" ++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + + [[package]] + name = "web-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" ++checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "winapi", ++ "windows-sys", + ] + + [[package]] +@@ -716,3 +665,97 @@ 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-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[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" ++ ++[[package]] ++name = "zerocopy" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++dependencies = [ ++ "byteorder", ++ "zerocopy-derive", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] +-- +2.46.0 + diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix new file mode 100644 index 0000000000000..e2ca5ee7af93e --- /dev/null +++ b/pkgs/by-name/fc/fcp/package.nix @@ -0,0 +1,53 @@ +{ + expect, + fetchFromGitHub, + lib, + rustPlatform, + stdenv, + fetchpatch, +}: + +rustPlatform.buildRustPackage rec { + pname = "fcp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "svetlitski"; + repo = "fcp"; + rev = "refs/tags/v${version}"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; + }; + + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch"; + hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI="; + }) + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch"; + hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY="; + }) + ./0001-update-Cargo.lock.patch + ]; + + cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8="; + + nativeBuildInputs = [ expect ]; + + # character_device fails with "File name too long" on darwin + doCheck = !stdenv.hostPlatform.isDarwin; + + postPatch = '' + patchShebangs tests/*.exp + ''; + + meta = { + description = "Significantly faster alternative to the classic Unix cp(1) command"; + homepage = "https://github.com/svetlitski/fcp"; + changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "fcp"; + }; +} diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 643775892bbd7..ea4c5cfb74c5a 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.8"; + version = "2.7.0"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-l1kyNpUIqezMfInhrKgnTnArqeSjvhBwdqVi0aUlKF8="; + hash = "sha256-CwydKX8cCtmrUSLUHNCDOteVmkjzj0zMHgwUyrWrWm8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 7b938a93c01de..ff704f6d27cbd 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -1,37 +1,28 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, bzip2 -, libgit2 -, nix-update-script -, zlib -, zstd -, zoxide +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + libgit2, + nix-update-script, + zlib, + zstd, + zoxide, }: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; - rev = "v${version}"; - hash = "sha256-7KuL3YkKhjcZSMSipbNITaA9/MGo54f3lz3fVOgy52s="; + rev = "refs/tags/v${version}"; + hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; }; - cargoPatches = [ - # https://github.com/kyoheiu/felix/pull/292 - (fetchpatch2 { - name = "update-cargo.lock-for-2.13.0.patch"; - url = "https://github.com/kyoheiu/felix/commit/5085b147103878ee8138d4fcf7b204223ba2c3eb.patch"; - hash = "sha256-7Bga9hcJCXExA/jnrR/HuZgOOVBbWs1tdTwxldcvdU8="; - }) - ]; - - cargoHash = "sha256-FX3AsahU5ZLMuylwo1jihP9G4Dw1SFv1oMXcuOqDTF8="; + cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index ef827725267e9..b4e5b6c42c5b3 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -1,27 +1,26 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, replaceVars, git, cargo, - stdenv, + versionCheckHook, darwin, nix-update-script, - testers, - hatch, }: python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; rev = "refs/tags/hatch-v${version}"; - hash = "sha256-HW2vDVsFrdFRRaPNuGDg9DZpJd8OuYDIqA3KQRa3m9o="; + hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; @@ -61,11 +60,16 @@ python3Packages.buildPythonApplication rec { pytest-xdist setuptools ] - ++ [ cargo ] + ++ [ + cargo + versionCheckHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; + versionCheckProgramArg = [ "--version" ]; + preCheck = '' export HOME=$(mktemp -d); ''; @@ -101,9 +105,6 @@ python3Packages.buildPythonApplication rec { "test_new_selected_python" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://github.com/NixOS/nixpkgs/issues/209358 - "test_scripts_no_environment" - # This test assumes it is running on macOS with a system shell on the PATH. # It is not possible to run it in a nix build using a /nix/store shell. # See https://github.com/pypa/hatch/pull/709 for the relevant code. @@ -126,8 +127,12 @@ python3Packages.buildPythonApplication rec { ]; passthru = { - tests.version = testers.testVersion { package = hatch; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "hatch-v([0-9.]+)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 86274edd4f3e2..1882757865014 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf_25, + protobuf, grpc, pandoc, python3, @@ -23,18 +23,23 @@ curl, libarchive, + + nix-update-script, + testers, + justbuild, }: -let stdenv = gccStdenv; +let + stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; - rev = "v${version}"; - hash = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io="; + rev = "refs/tags/v${version}"; + hash = "sha256-N9K1n2ttxhD0q2BXprt/nQdQseUtpaFmEZUcxRJV5C8="; }; bazelapi = fetchurl { @@ -47,68 +52,69 @@ stdenv.mkDerivation rec { hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A="; }; - nativeBuildInputs = - [ - # Tools for the bootstrap process - jq - pkg-config - python3 - unzip - wget - coreutils - - # Dependencies of just - cli11 - # Using fmt 10 because this is the same version upstream currently - # uses for bundled builds - # For future updates: The currently used version can be found in the file - # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json - # under the key .repositories.fmt - fmt_10 - microsoft-gsl - nlohmann_json - - # Dependencies of the compiled just-mr - curl - libarchive - ]; + nativeBuildInputs = [ + # Tools for the bootstrap process + jq + pkg-config + python3 + unzip + wget + coreutils + + # Dependencies of just + cli11 + # Using fmt 10 because this is the same version upstream currently + # uses for bundled builds + # For future updates: The currently used version can be found in the file + # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json + # under the key .repositories.fmt + fmt_10 + microsoft-gsl + nlohmann_json + + # Dependencies of the compiled just-mr + curl + libarchive + ]; buildInputs = [ grpc libgit2 openssl - protobuf_25 + protobuf python3 ]; - postPatch = '' - sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py - sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched - mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py - ''; - - /* The build phase follows the bootstrap procedure that is explained in - https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md - - The bootstrap of the just binary depends on two proto libraries, which are - supplied as external distfiles. - - The microsoft-gsl library does not provide a pkg-config file, so one is - created here. In case also the GNU Scientific Library would be used (which - has also the pkg-config name gsl) this would cause a conflict. However, it - is very unlikely that a build tool will ever depend on a GPL math library. - - The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the - current version of just, the next release will contain a fix from upstream. - https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a - + postPatch = + '' + sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py + sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched + mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py + ''; + + /* + The build phase follows the bootstrap procedure that is explained in + https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md + + The bootstrap of the just binary depends on two proto libraries, which are + supplied as external distfiles. + + The microsoft-gsl library does not provide a pkg-config file, so one is + created here. In case also the GNU Scientific Library would be used (which + has also the pkg-config name gsl) this would cause a conflict. However, it + is very unlikely that a build tool will ever depend on a GPL math library. + + The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the + current version of just, the next release will contain a fix from upstream. + https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a */ buildPhase = '' @@ -165,11 +171,22 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = justbuild; + command = "just version"; + version = builtins.replaceStrings [ "." ] [ "," ] version; + }; + }; + + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; - license = licenses.asl20; - maintainers = with maintainers; [clkamp]; + changelog = "https://github.com/just-buildsystem/justbuild/releases/tag/v${version}"; + mainProgram = "just"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ clkamp ]; }; } diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index c423a0d8c74f4..766720dfd65b8 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -147,8 +147,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "70392f1f81470607ba3afef04aa56c9f65587664"; - hash = "sha256-PgdH3Q4lM45a7aLeN/19i0Ld4NuTfzh/caYOSdooFao="; + rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657"; + hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk="; fetchSubmodules = true; }; postPatch = @@ -299,8 +299,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "0d2e2aed80109e8696791083bde3b58e190b7812"; - hash = "sha256-HE9FLwLGVCggEF7VjWtdNhNnhe7c1RQp30spEIkK4TI="; + rev = "fdbfb460ed546452a5d53611bba66d10d842e719"; + hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk="; }; nativeBuildInputs = [ @@ -431,12 +431,12 @@ let stdenv; pname = "local-ai"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-UlXBg/FKv/GNz2PCEVvzhILNdyQvTfkw157sNpunf2I="; + hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0="; }; prepare-sources = diff --git a/pkgs/by-name/mi/mingtest/package.nix b/pkgs/by-name/mi/mingtest/package.nix index 78ea3d7b995c3..af847cd2f77b0 100644 --- a/pkgs/by-name/mi/mingtest/package.nix +++ b/pkgs/by-name/mi/mingtest/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "mingtest"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "craflin"; repo = "mingtest"; rev = "refs/tags/${version}"; - hash = "sha256-Iy2KvFCFk+uoztTVxTY7HMdc5GI4gSGqGmbJePJ5CO8="; + hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM="; }; postPatch = '' diff --git a/pkgs/by-name/mj/mjmap/package.nix b/pkgs/by-name/mj/mjmap/package.nix new file mode 100644 index 0000000000000..8751757fb5686 --- /dev/null +++ b/pkgs/by-name/mj/mjmap/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + unstableGitUpdater, +}: + +buildGoModule { + pname = "mjmap"; + version = "0.1.0-unstable-2023-11-13"; + + src = fetchFromSourcehut { + owner = "~rockorager"; + repo = "mjmap"; + rev = "d54badae8152b4db6eec8b03a7bd7c5ff1724aa7"; + hash = "sha256-yFYYnklNNOHTfoT54kOIVoM4t282/0Ir4l72GmqlGSY="; + }; + + vendorHash = "sha256-fJuPrzjRH0FpYj2D9CsFdsdzYT0C3/D2PhmJIZTsgfQ="; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/mjmap --version >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v."; + }; + + meta = { + description = "Sendmail‐compatible JMAP client"; + homepage = "https://git.sr.ht/~rockorager/mjmap"; + license = lib.licenses.mpl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.emily ]; + mainProgram = "mjmap"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/ne/nemu/package.nix b/pkgs/by-name/ne/nemu/package.nix index c57b4dca6ec4f..5f543e13cffbe 100644 --- a/pkgs/by-name/ne/nemu/package.nix +++ b/pkgs/by-name/ne/nemu/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - busybox # for start-stop-daemon coreutils dbus gettext diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 8bca17373560a..77b242ec9058b 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.3"; + version = "0.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk="; + hash = "sha256-p7ajWY/eGWHPosxFXOKs2YeMAny+/PJ68IAU2NNgm0w="; }; - cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY="; + cargoHash = "sha256-F6titbFM0zsbbwZKcSx3U4cknea83TCITiGm7rPXmFE="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix index 17f73913fcfb3..105ce97a0684d 100644 --- a/pkgs/by-name/oq/oqs-provider/package.nix +++ b/pkgs/by-name/oq/oqs-provider/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "open-quantum-safe"; repo = "oqs-provider"; rev = finalAttrs.version; - hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg="; + hash = "sha256-v7YIE5uzBvQHfi2hqkkRrW0F3K4haZyuoKHxAtRqQDA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index cc5257d6189b0..96e6dc775ae8a 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-qTTAViVZEw4XgYADoonsVZPulp43lFFkX2xE5OFbL3s="; + hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA="; }; - cargoHash = "sha256-QSeAAaT1LbcWLmML8i2sgRtTnimZfKgLq6qhnpQr8cc="; + cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index be85c54ffc17d..5545ab8a94f2a 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg="; + hash = "sha256-D4OFHL9AS8oAwMZHoXaDpHKfMBQEaOd18eWAwVW4EJA="; }; dontConfigure = true; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 1946ffab2fac7..9cdcd7ab4104a 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -6,20 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "refs/tags/v${version}"; - hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE="; + hash = "sha256-S9/bPgItbr6rRr4WX+hmyU1RvKn5gz9FdZjYlr0hnd0="; }; - postPatch = '' - sed -i '/addopts/d' setup.cfg - ''; - build-system = with python3.pkgs; [ setuptools ]; @@ -36,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = with python3.pkgs; [ - pytest7CheckHook + pytestCheckHook waitress ]; diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index 587df043f050f..054a26f9e394e 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + nixosTests, fetchFromGitHub, cmake, asciidoc, @@ -60,8 +61,12 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' rm $out/lib/*.a + + ln -s $out/bin/sfsmount $out/bin/mount.saunafs ''; + passthru.tests = nixosTests.saunafs; + meta = with lib; { description = "Distributed POSIX file system"; homepage = "https://saunafs.com"; diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 713f587021134..ac647e93b1958 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -1,11 +1,37 @@ -{ lib -, stdenv -, fetchgit -, acpica-tools -, python3 -, writeText +{ + lib, + acpica-tools, + fetchgit, + python3, + stdenv, + writeText, + # Configurable options + ___build-type ? "csm", }: +assert lib.elem (___build-type) [ + "coreboot" + # SeaBIOS with CSM (Compatible Support Module) support; learn more at + # https://www.electronicshub.org/what-is-csm-bios/ + "csm" + "qemu" +]; +let + biosfile = + { + "coreboot" = "bios.bin.elf"; + "csm" = "Csm16.bin"; + "qemu" = "bios.bin"; + } + .${___build-type}; + configuration-string = + { + "coreboot" = "CONFIG_COREBOOT"; + "csm" = "CONFIG_CSM"; + "qemu" = "CONFIG_QEMU"; + } + .${___build-type}; +in stdenv.mkDerivation (finalAttrs: { pname = "seabios"; version = "1.16.3"; @@ -16,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk="; }; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; nativeBuildInputs = [ python3 ]; @@ -29,31 +58,42 @@ stdenv.mkDerivation (finalAttrs: { "EXTRAVERSION=\"-nixpkgs\"" ]; - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + hardeningDisable = [ + "fortify" + "pic" + "stackprotector" + ]; - postConfigure = let - config = writeText "config.txt" (lib.generators.toKeyValue { } { - # SeaBIOS with CSM (Compatible Support Module) support; learn more at - # https://www.electronicshub.org/what-is-csm-bios/ - "CONFIG_CSM" = "y"; - "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; - "CONFIG_QEMU_HARDWARE" = "y"; - }); - in '' - cp ${config} .config - make olddefconfig - ''; + postConfigure = + let + config = writeText "config.txt" ( + lib.generators.toKeyValue { } { + "${configuration-string}" = "y"; + "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; + "CONFIG_QEMU_HARDWARE" = "y"; + } + ); + in + '' + cp ${config} .config + make olddefconfig + ''; installPhase = '' runHook preInstall - mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/ - cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/ - install -Dm644 out/Csm16.bin -t $out/share/seabios/ + mkdir -pv ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ + cp -v docs/* ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ + install -Dm644 out/${biosfile} -t $out/share/seabios/ runHook postInstall ''; + passthru = { + build-type = ___build-type; + firmware = "${finalAttrs.finalPackage}/share/seabios/${biosfile}"; + }; + meta = { homepage = "https://www.seabios.org"; description = "Open source implementation of a 16bit x86 BIOS"; @@ -64,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ lgpl3Plus ]; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.systems.inspect.patternLogicalAnd - lib.systems.inspect.patterns.isUnix - lib.systems.inspect.patterns.isx86; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; }) diff --git a/pkgs/by-name/sn/snapweb/package.nix b/pkgs/by-name/sn/snapweb/package.nix new file mode 100644 index 0000000000000..e3b1673a9180b --- /dev/null +++ b/pkgs/by-name/sn/snapweb/package.nix @@ -0,0 +1,40 @@ +{ + buildNpmPackage, + lib, + fetchFromGitHub, + pkg-config, + vips, +}: + +buildNpmPackage rec { + pname = "snapweb"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapweb"; + rev = "v${version}"; + hash = "sha256-rrJmuTFk2dC+GqYmBZ+hu5hx1iknAgSWjr22S7bfmEE="; + }; + + npmDepsHash = "sha256-n1MmU9zHyuEqtQSfYpQ+0hDM0z6ongcFsGyikPMyNSU="; + + # For 'sharp' dependency, otherwise it will try to build it + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ vips ]; + + installPhase = '' + runHook preInstall + + cp -r dist $out/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Web client for Snapcast"; + homepage = "https://github.com/badaix/snapweb"; + maintainers = with maintainers; [ ettom ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix index e92dc058eaef4..5b879c783c876 100644 --- a/pkgs/by-name/sw/sway-assign-cgroups/package.nix +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -5,12 +5,12 @@ python3Packages.buildPythonApplication rec { pname = "sway-assign-cgroups"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "alebastr"; repo = "sway-systemd"; - rev = "v${version}"; - hash = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-AJ87/sPy8IVJgb5YehfUfNTOFEDithLfiTxgZfZf238="; }; format = "other"; diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix index 041ecff720116..549ba705b98f2 100644 --- a/pkgs/by-name/tt/ttop/package.nix +++ b/pkgs/by-name/tt/ttop/package.nix @@ -1,14 +1,19 @@ -{ lib, buildNimPackage, fetchFromGitHub, testers }: +{ + lib, + buildNimPackage, + fetchFromGitHub, + testers, +}: buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-/rs5JjTXxptVHXL3fY8qP6Be3r5N871CEbUH7w6zx4A="; + hash = "sha256-KfPlO0RmahavA3dsxNDozuNOXIRAwDTtT+zFaF6hYd0="; }; lockFile = ./lock.json; @@ -29,7 +34,10 @@ buildNimPackage (finalAttrs: { changelog = "https://github.com/inv2004/ttop/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ figsoda sikmir ]; + maintainers = with maintainers; [ + figsoda + sikmir + ]; mainProgram = "ttop"; }; }) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 72ca626c89338..de058108efaec 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; rev = finalAttrs.version; - hash = "sha256-hVUEvlaVx2Ai1lYXU6hwiLToEMhCPWlSIh1WrbYKmco="; + hash = "sha256-Dg+KGZcqbE1nBPaemZlWQPaUQQJmaSe0nyDQRXJzwuE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index b8424a4593db4..acd09406fe325 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-Awr2NvXsWaEeJpdCA94q7kxQ04IDpwNxnm7GxB4J09w=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-LPH9JbOXOBjT4vMWNGMvQYDVnTE6p2tFTlOe8HOFsk0=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_x86_64": { - "hash": "sha256-fNY+wXqlqUSdRVptDNuk1ouddSlIKQrBFPIij9Qa0jM=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-jwbwRgQ7WR04zCki7PQuuMZD7v2tFl3Gm1olZ28FAp8=", + "version": "0.2024.10.08.08.02.stable_02" }, "linux_aarch64": { - "hash": "sha256-EdQjc8uXG4cpkgnIYRaBXLeuYqhbN7rs4bU+L/Cc7XA=", - "version": "0.2024.10.08.08.02.stable_01" + "hash": "sha256-Ticn8OMYHWQT88WQSpgcT/kBVnHyoDHNhTk0m4T45bQ=", + "version": "0.2024.10.08.08.02.stable_02" } } diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix index 5fa38d280aef0..5494c8369d241 100644 --- a/pkgs/by-name/yo/yofi/package.nix +++ b/pkgs/by-name/yo/yofi/package.nix @@ -1,12 +1,14 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, autoPatchelfHook -, fontconfig -, libxkbcommon -, pkg-config -, libgcc -, wayland +{ + lib, + fetchFromGitHub, + fetchpatch, + rustPlatform, + autoPatchelfHook, + fontconfig, + libxkbcommon, + pkg-config, + libgcc, + wayland, }: rustPlatform.buildRustPackage rec { pname = "yofi"; @@ -19,7 +21,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg="; }; - cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc="; + cargoPatches = [ + (fetchpatch { + name = "bump-time-1.80.0.patch"; + url = "https://github.com/l4l/yofi/commit/438e180bf5132d29a6846e830d7227cb996ade3e.patch"; + hash = "sha256-o/kwQRIG6MASGYnepb96pL1qfI+/CNTqc5maDPjSZXk="; + }) + ]; + + cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk="; + nativeBuildInputs = [ autoPatchelfHook pkg-config @@ -31,7 +42,10 @@ rustPlatform.buildRustPackage rec { ]; appendRunpaths = [ - (lib.makeLibraryPath [ fontconfig wayland ]) + (lib.makeLibraryPath [ + fontconfig + wayland + ]) ]; checkFlags = [ diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 9d6385ae74b34..d62841b48d0af 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -3,6 +3,7 @@ stdenv, llvm_meta, monorepoSrc, + release_version, runCommand, cmake, libxml2, @@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: { inherit version patches; # Blank llvm dir just so relative path works - src = runCommand "bolt-src-${finalAttrs.version}" { } '' - mkdir $out - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" + src = runCommand "bolt-src-${finalAttrs.version}" { } ( + '' + mkdir $out + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... - cp -r ${monorepoSrc}/llvm/ "$out" - chmod -R +w $out/llvm - ''; + # tablegen stuff, probably not the best way but it works... + cp -r ${monorepoSrc}/llvm/ "$out" + chmod -R +w $out/llvm + '' + ); sourceRoot = "${finalAttrs.src.name}/bolt"; diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 2b5aca1093485..5c9662c24d58a 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -24,12 +24,14 @@ let pname = "clang"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" - '' else src; + '') else src; self = stdenv.mkDerivation (finalAttrs: rec { inherit pname version patches; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index a6d727739d271..cce348b3ef50c 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -47,11 +47,13 @@ let pname = baseName + lib.optionalString (haveLibc) "-libc"; src' = if monorepoSrc != null then - runCommand "${baseName}-src-${version}" {} '' + runCommand "${baseName}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${baseName} "$out" - '' else src; + '') else src; preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 55d26de9fc099..2f47f1a583c58 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -346,13 +346,7 @@ let tools = lib.makeExtensible ( tools: let - callPackage = newScope ( - tools - // args - // metadata - # Previously monorepoSrc was erroneously not being passed through. - // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); + callPackage = newScope (tools // args // metadata); clangVersion = if (lib.versionOlder metadata.release_version "16") then metadata.release_version diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 299b27417b6ad..c24fc6e3b4c04 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -22,11 +22,17 @@ stdenv.mkDerivation rec { pname = "libclc"; inherit version; - src = runCommand "${pname}-src-${version}" { } '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${pname} "$out" + '' + ); sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 77854ddfcc5de..63b9737092b89 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -19,7 +19,9 @@ let src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libcxx" cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index d5c0f7cb3a095..32cf5cb464609 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -19,21 +19,23 @@ let pname = "lld"; src' = if monorepoSrc != null then - runCommand "lld-src-${version}" {} '' + runCommand "lld-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libunwind" cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" mkdir -p "$out/llvm" - '' else src; + '') else src; postPatch = lib.optionalString (lib.versions.major release_version == "12") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(' mkdir -p libunwind/include tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (lib.versions.major release_version == "13") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -75,4 +77,4 @@ stdenv.mkDerivation (rec { of several different linkers. ''; }; -} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; })) +} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 4f679f4dcff11..38bc91977c36e 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -32,7 +32,9 @@ let if monorepoSrc != null then runCommand "lldb-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/lldb "$out" '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) '' mkdir -p "$out/llvm" diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 281a21ca15242..fc139c703774e 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -77,11 +77,15 @@ let pname = "llvm"; + # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/third-party "$out" '' + lib.optionalString enablePolly '' chmod u+w "$out/${pname}/tools" diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index e4dd12d69e588..9c3c71c3b705e 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , llvm_meta +, release_version , buildLlvmTools , monorepoSrc , runCommand @@ -18,14 +19,16 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" { } '' + src = runCommand "${pname}-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/third-party "$out/third-party" mkdir -p "$out/llvm" - ''; + ''); sourceRoot = "${src.name}/mlir"; diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57c6de07c7843..1ad5948edb863 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -21,11 +21,13 @@ let pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" - '' else src; + '') else src; in stdenv.mkDerivation (rec { inherit pname version patches; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e2747bd701fcc..83ea880a9fbeb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -740,10 +740,7 @@ unsupported-platforms: mpi-hs-cereal: [ aarch64-linux, platforms.darwin ] mpi-hs-store: [ aarch64-linux, platforms.darwin ] mplayer-spot: [ aarch64-linux, platforms.darwin ] - monomer: [ platforms.darwin ] # depends on mesa - monomer-hagrid: [ platforms.darwin ] # depends on mesa mptcp-pm: [ platforms.darwin ] - nanovg: [ platforms.darwin ] # depends on mesa netlink: [ platforms.darwin ] network-unexceptional: [ platforms.darwin ] # depends on posix-api notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51bdc54df2be7..8f2a54ac9d0e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124209,7 +124209,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk_4_0 + , text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; @@ -124220,11 +124220,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -124565,7 +124565,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk_4_0 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit"; @@ -124580,17 +124580,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk_4_0 + , haskell-gi-overloading, text, transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -124605,17 +124605,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk_4_0 + , transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124630,13 +124630,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -212197,7 +212197,6 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; mainProgram = "dev-test-app"; }) {inherit (pkgs) glew;}; @@ -212248,7 +212247,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A datagrid widget for the Monomer library"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218018,7 +218016,6 @@ self: { testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; description = "Haskell bindings for nanovg"; license = lib.licenses.isc; - badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) freetype; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs.xorg) libX11;}; @@ -309861,7 +309858,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309880,7 +309877,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; + executablePkgconfigDepends = [ gtk3 webkitgtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -309893,7 +309890,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; + }) {inherit (pkgs) gtk3; webkitgtk = null;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -332440,30 +332437,30 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk_4_0 + , webkitgtk }: mkDerivation { pname = "webkitgtk3"; @@ -332474,27 +332471,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + libraryPkgconfigDepends = [ webkitgtk ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk_4_0 ]; - description = "JavaScriptCore FFI from webkitgtk_4_0"; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk_4_0;}; + }) {webkitgtk = null;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index ab72fa35cda91..2337b2eaa7c7f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -215,23 +215,6 @@ let isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); - passthru = - attrs.passthru or { } - // { - updateScript = let - filename = head (splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; - } - // optionalAttrs (dependencies != []) { - inherit dependencies; - } - // optionalAttrs (optional-dependencies != {}) { - inherit optional-dependencies; - } - // optionalAttrs (build-system != []) { - inherit build-system; - }; - # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { @@ -324,7 +307,21 @@ let outputs = outputs ++ optional withDistOutput "dist"; - inherit passthru; + passthru = attrs.passthru or { } + // { + updateScript = let + filename = head (splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; + } + // optionalAttrs (dependencies != []) { + inherit dependencies; + } + // optionalAttrs (optional-dependencies != {}) { + inherit optional-dependencies; + } + // optionalAttrs (build-system != []) { + inherit build-system; + }; meta = { # default to python's platforms @@ -351,5 +348,5 @@ let in extendDerivation (disabled -> throw "${name} not supported for interpreter ${python.executable}") - passthru + { } self diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 9fad8e56d5d4b..1b10b44fb2433 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -37,15 +37,15 @@ let else ./python2/mk-python-derivation.nix; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonPackage = makeOverridablePythonPackage (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules - })); + }); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonApplication = makeOverridablePythonPackage (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. - })); + }); # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 6574b6295744c..ba96f708257df 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -75,7 +75,7 @@ let is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + } // { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -105,22 +105,24 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug - cpython-gdb = callPackage ./tests/test_cpython_gdb { - interpreter = python; - }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 - tkinter = callPackage ./tests/test_tkinter { - interpreter = python; - }; - } - ); + integrationTests = lib.optionalAttrs (!python.isPyPy) ({ + # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 + tkinter = callPackage ./tests/test_tkinter { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug + # fails on python3.13 + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13") { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + # mypy does not yet support python3.13 + # https://github.com/python/mypy/issues/17264 + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }); # Test editable package support editableTests = let diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 4d9c34d728d18..5b2409a779e61 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -117,17 +117,15 @@ stdenv.mkDerivation { # (check-ldap) the bdb backend got deprecated in favour of mdb in openldap 2.5.0, # but the heimdal tests still seem to expect bdb as the openldap backend. # This might be fixed upstream in a future update. - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace tests/ldap/slapd-init.in \ - --replace 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' + --replace-fail 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' substituteInPlace tests/ldap/check-ldap.in \ - --replace 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' + --replace-fail 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' substituteInPlace tests/ldap/slapd.conf \ - --replace 'database bdb' 'database mdb' - - runHook postPatch + --replace-fail 'database bdb' 'database mdb' + substituteInPlace tests/kdc/check-iprop.in \ + --replace-fail '/bin/pwd' 'pwd' ''; # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 612f8e3845708..9016424d4b303 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; + hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 9a42e693da280..e4cf47683ec84 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.053"; + version = "1.055"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo="; + sha256 = "sha256-2apGVg/f2FCC8gKlqc5kdo/gxZhmDwEyBqjJwX7NDzY="; }; buildInputs = [ fastjet ]; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index a809c48b73133..bcbd29bcc9636 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.34.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0="; + hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 79fcf2764bd36..90b3423ac3535 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -15,6 +15,7 @@ pydantic, pydantic-core, requests, + sagemaker, tokenizers, types-requests, typing-extensions, @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.10.0"; + version = "5.11.0"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8="; + hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8="; }; build-system = [ poetry-core ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pydantic-core requests + sagemaker tokenizers types-requests typing-extensions diff --git a/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch new file mode 100644 index 0000000000000..28f7b182809f2 --- /dev/null +++ b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch @@ -0,0 +1,63 @@ +From c5af641cccf663dffb4a47d32e28404f609badce Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Sat, 12 Oct 2024 03:39:12 +0000 +Subject: [PATCH 1/2] chore(KaTeX): bump to 0.7.1 + +Many bugfixes. This KaTeX is still quite old, +but versions beyond this have backwards-incompatibilities +(starting in 0.8). +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index be0005d..8aacb56 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN,加载速度有时会很慢,或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min" ++ css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", ++ js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + + +From 3d082a738262b057d33b9aa8c777d50113143952 Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Mon, 7 Oct 2024 17:44:39 -0700 +Subject: [PATCH 2/2] fix(KaTeX): Use jsdelivr instead of bootcdn + +Bootcdn was compromised by a malicious actor: +https://sansec.io/research/polyfill-supply-chain-attack + +KaTeX recommends using jsdelivr, so I used that: +https://katex.org/docs/browser +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index 8aacb56..a31e817 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN,加载速度有时会很慢,或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" ++ css : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.css", ++ js : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.js" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix index 96b5c93bae2d5..a495b41c892d0 100644 --- a/pkgs/development/python-modules/django-mdeditor/default.nix +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -18,6 +18,10 @@ buildPythonPackage { hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; }; + patches = [ + ./Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch + ]; + propagatedBuildInputs = [ django ]; # no tests diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 0d4a31376f32d..6f1b346274a2e 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -2,49 +2,56 @@ lib, buildPythonPackage, fetchFromGitHub, - antlr4, - antlr4-python3-runtime, igraph, pygments, + scikit-build-core, + pybind11, + ninja, + ruff, + cmake, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.5"; + version = "0.2.1.post2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-dGbzZYEFEWE5bUz+647pPzP4Z/XmrJU82jNT4ZBRNHk="; + hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; + # Include a pinned antlr4 fork used as a C++ library + fetchSubmodules = true; }; nativeBuildInputs = [ - antlr4 setuptools + scikit-build-core + ninja + cmake + ruff ]; - pythonRelaxDeps = [ - # antlr output is rebuilt in postPatch step. - "antlr4-python3-runtime" - # igraph > 0.10.4 was marked as incompatible by upstream - # due to a breaking change introduced in 0.10.5. Later versions reverted - # this change, and introduced a deprecation warning instead. - # - # https://github.com/igraph/python-igraph/issues/693 - "igraph" - ]; + # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. + # We thus do not rebuild them. postPatch = '' - antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 + substituteInPlace Makefile \ + --replace-fail ./generate_parser_bindings.py "python3 ./generate_parser_bindings.py" + + # Doesn’t detect that package for some reason + substituteInPlace pyproject.toml \ + --replace-fail "\"scikit-build-core<=0.9.8\"," "" ''; + dontUseCmakeConfigure = true; + propagatedBuildInputs = [ - antlr4-python3-runtime igraph + pybind11 ]; optional-dependencies.pygments = [ pygments ]; diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 0a5632ad31de0..952056492c709 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gios"; - version = "4.0.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "gios"; rev = "refs/tags/${version}"; - hash = "sha256-rjC4zWWtaPxuBcjiO9dVsXD4dTa47iwkKuSFx+QXeXw="; + hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index e86eb4e6e0e48..bb18da52f9515 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I="; + hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1170485bf39f9..fb88bcfebc841 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,17 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, + replaceVars, pythonOlder, - setuptools, + hatch-vcs, + hatchling, backports-zoneinfo, python-dateutil, - pytz, + tzdata, hypothesis, pytestCheckHook, }: buildPythonPackage rec { - version = "5.0.13"; + version = "6.0.1"; pname = "icalendar"; pyproject = true; @@ -20,14 +22,23 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; + hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs="; }; - build-system = [ setuptools ]; + patches = [ + (replaceVars ./no-dynamic-version.patch { + inherit version; + }) + ]; + + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ python-dateutil - pytz + tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/icalendar/no-dynamic-version.patch b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch new file mode 100644 index 0000000000000..4754b6441a5f1 --- /dev/null +++ b/pkgs/development/python-modules/icalendar/no-dynamic-version.patch @@ -0,0 +1,17 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9730e46..9834686 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -34,11 +34,7 @@ maintainers = [ + { name="Christian Geier" }, + { name="Jaca", email="vitouejj@gmail.com" }, + ] +-# These attributes are dynamically generated by hatch-vcs +-dynamic = [ +- "urls", +- "version" +-] ++version = "@version@" + description = "iCalendar parser/generator" + readme = { file = "README.rst", content-type = "text/x-rst" } + diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 8c08395906764..b5303060948c7 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, pytestCheckHook, poetry-core, @@ -25,6 +26,14 @@ buildPythonPackage rec { hash = "sha256-Bp+Wz88q65Gem8LyRz0A4xE5hIgOD+iZ7E1UlnfFiD4="; }; + patches = [ + (fetchpatch2 { + name = "icalendar-v6-compat.patch"; + url = "https://github.com/jazzband/icalevents/commit/fa925430bd63e46b0941b84a1ae2c9a063f2f720.patch"; + hash = "sha256-MeRC3iJ5raKvl9udzv/44Vs34LxSzq1S6VVKAVFSpiY="; + }) + ]; + build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ipytablewidgets/default.nix b/pkgs/development/python-modules/ipytablewidgets/default.nix index 0f54bb3105678..e536861e1061b 100644 --- a/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -12,20 +12,18 @@ pandas, setuptools, traitlets, - traittypes, - wheel, }: buildPythonPackage rec { pname = "ipytablewidgets"; - version = "0.3.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; + hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw="; }; # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if @@ -37,20 +35,18 @@ buildPythonPackage rec { --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' ''; - nativeBuildInputs = [ + build-system = [ jupyter-packaging jupyterlab setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets lz4 numpy pandas traitlets - traittypes ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 4c8f04cbd5119..e4ddf9735fec3 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY="; + hash = "sha256-nhi15afsvzM0LCvtI5/dq5zOHmhM4Wk53lj6fKgx9NA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index e3a5bf6a39b7c..5887818342305 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec="; + hash = "sha256-k2i6oZudY59CmFt5qlWCCtZgywcbLHR9OUYIannSZ20="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 73652ca4c5328..e7f9d93942a9c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -58,8 +58,8 @@ rec { "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.35.0" - "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0="; + buildMypyBoto3Package "acm-pca" "1.35.38" + "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE="; mypy-boto3-amp = buildMypyBoto3Package "amp" "1.35.0" @@ -102,8 +102,8 @@ rec { "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.35.0" - "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk="; + buildMypyBoto3Package "appflow" "1.35.39" + "sha256-W5GJoGRQUcjTBUYAWJjBgMKcAKRdn63deVsyU6ezRIU="; mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.35.0" @@ -294,8 +294,8 @@ rec { "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.35.33" - "sha256-hnmb6+m1iiVfzNjm1AxGlAkEjSbAslPe4st7i52Kj3w="; + buildMypyBoto3Package "codepipeline" "1.35.37" + "sha256-DHNj6IzWxg5qHpT0QaHQHNPkYk344fo/2/vUGLl8Kfg="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" @@ -414,8 +414,8 @@ rec { "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.35.0" - "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo="; + buildMypyBoto3Package "dms" "1.35.38" + "sha256-b9AA9n1WWgk4HV1U/3L/eVl4eualNyhYCjbFw+QvHV4="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.34" - "sha256-gi80wl0sVQmaeYdAiPIeeL2Uc8dwQuGDTFKRvbGh6Co="; + buildMypyBoto3Package "ec2" "1.35.38" + "sha256-AwY1//39/3P8l+zEsunb7Mun//B1wiR8ae+ZxGulzRo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,8 +462,8 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.21" - "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; + buildMypyBoto3Package "ecs" "1.35.38" + "sha256-udIe50T9ae7esIkpVqmMvRtTwv4xDJTiwkR94cX+2M4="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" @@ -474,8 +474,8 @@ rec { "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; mypy-boto3-elastic-inference = - buildMypyBoto3Package "elastic-inference" "1.35.0" - "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0="; + buildMypyBoto3Package "elastic-inference" "1.35.38" + "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g="; mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.35.36" @@ -494,12 +494,12 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.18" - "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY="; + buildMypyBoto3Package "elbv2" "1.35.39" + "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.35.18" - "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI="; + buildMypyBoto3Package "emr" "1.35.39" + "sha256-PAVHgUn9cbnu7EPOO2+SNbT+WrayTP/mmIoqt3Kw29E="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.35.4" @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.22" - "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; + buildMypyBoto3Package "guardduty" "1.35.39" + "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" @@ -674,8 +674,8 @@ rec { "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.35.0" - "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8="; + buildMypyBoto3Package "iotfleetwise" "1.35.38" + "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.35.0" @@ -994,8 +994,8 @@ rec { "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.35.0" - "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck="; + buildMypyBoto3Package "outposts" "1.35.38" + "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.35.0" @@ -1126,8 +1126,8 @@ rec { "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI="; mypy-boto3-robomaker = - buildMypyBoto3Package "robomaker" "1.35.0" - "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I="; + buildMypyBoto3Package "robomaker" "1.35.39" + "sha256-kh/KojcYdBfGA7BRorshz34R/Lx8e/WTa0kWpW78PcY="; mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.35.0" @@ -1154,8 +1154,8 @@ rec { "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.35.0" - "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E="; + buildMypyBoto3Package "route53resolver" "1.35.38" + "sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y="; mypy-boto3-rum = buildMypyBoto3Package "rum" "1.35.0" diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index d23fe4ab529b4..02485462a8b1c 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo="; + hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 81b37969126cb..436a8bbd15dd2 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -8,7 +8,7 @@ #This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary buildPythonPackage rec { pname = "pmdsky-debug-py"; - version = "8.0.4"; + version = "10.0.21"; pyproject = true; # SkyTemple specifically require this version. This is used when patching the binary, # and risk to be a bit problematic if using the latest version, given it doesn’t follow semver. @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-D81vXhYGxwvy26PvicniCLiS58LmrSP9ppzXKRzQSJc="; + sha256 = "sha256-uhLmEViiJ5+2Aw9MJP8GL7nhk8lMPcRZRB8WTDFXe+s="; }; prePatch = "cd src"; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index a144da1003693..5334ff2bbfdc8 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -16,21 +16,21 @@ python-dateutil, pyusb, requests, - spsdk, tqdm, tlv8, typing-extensions, - pyserial, - protobuf, click-aliases, semver, nethsm, importlib-metadata, + nitrokey, + pyscard, + asn1crypto, }: let pname = "pynitrokey"; - version = "0.4.50"; + version = "0.6.0"; mainProgram = "nitropy"; in @@ -40,10 +40,14 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; + hash = "sha256-pY6ATORZDPGRnkN6dse1s/DzQRpplDbPAGUHU4E7U9M="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ flit-core ]; + + dependencies = [ certifi cffi click @@ -55,21 +59,16 @@ buildPythonPackage { python-dateutil pyusb requests - spsdk tqdm tlv8 typing-extensions - pyserial - protobuf click-aliases semver nethsm importlib-metadata - ]; - - nativeBuildInputs = [ - flit-core - installShellFiles + nitrokey + pyscard + asn1crypto ]; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 3be853d2fc5e4..de3e2f377d886 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.0"; + version = "3.3.2"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-1Ggxi61epge6Rxc/vJ7OuuNjjeaQYReEPeOZV8DLghk="; + hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM="; }; build-system = [ setuptools ]; @@ -47,12 +47,6 @@ buildPythonPackage rec { pygments ]; - disabledTests = lib.optionals (lib.versionOlder icalendar.version "6") [ - # ModuleNotFoundError: No module named 'icalendar.timezone' - "test_can_import_zoneinfo" - "test_documentation_file" - ]; - pythonImportsCheck = [ "recurring_ical_events" ]; meta = { diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 64d63ce24f976..684c06255dfc5 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-A1ZDyYHjbC2jz+m4EHRPlOMzkpwCCxo902bMK4I/+I4="; + hash = "sha256-uonOifCGvSKJhxTAqD49BOHDdN69pRexcb2ny1GwqjA="; }; patches = [ diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 57551e9e67402..5baa8bb7405fe 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, appdirs, dungeon-eos, explorerscript, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.7.0"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,19 +37,11 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = "skytemple-files"; rev = version; - hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0="; + hash = "sha256-4ENuYq074j/VdzLyrGVCGaZhoStwlgJWTqGbrt20A3Q="; # Most patches are in submodules fetchSubmodules = true; }; - patches = [ - (fetchpatch2 { - name = "fix-tests.patch"; - url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch"; - hash = "sha256-oTV2EQQ2OPgu2pYB2fLd4jODfybnV29YNLxzDs2v6Cg="; - }) - ]; - postPatch = '' substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ --replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" @@ -86,10 +77,13 @@ buildPythonPackage rec { parameterized xmldiff ] ++ optional-dependencies.spritecollab; - pytestFlagsArray = [ "test/" ]; + + preCheck = "pushd test"; + postCheck = "popd"; + disabledTestPaths = [ - "test/skytemple_files_test/common/spritecollab/sc_online_test.py" - "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test + "skytemple_files_test/common/spritecollab/sc_online_test.py" + "skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test ]; pythonImportsCheck = [ "skytemple_files" ]; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 83873d2e0aa3b..8b29df6930884 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, libiconv, Foundation, rustPlatform, @@ -14,18 +14,20 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.6.5"; + version = "1.8.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bf+umrb5EIoCD2kheVpf9IwsW4Sf2hR7XOEzscYtLA8="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = "skytemple-rust"; + rev = version; + hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0a57RmZPztcIeRs7GNYe18JO+LlWoeNWG3nD9cG0XIU="; + hash = "sha256-Gdypi9DJAXQgNaRCLEt4LTqUhBJC8plH0YhgNOIOGvA="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index e50bc2ae59aa8..64bd47671d034 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.7.0"; + version = "1.8.2"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "skytemple-ssb-debugger"; rev = version; - hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q="; + hash = "sha256-HmJOjHX2/P284DSIdKuSz3++Qr1fKVGRQmA/+cMrcYw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock b/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock index 2960a441457bc..f1e46028962ef 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/Cargo.lock @@ -4,36 +4,30 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -61,15 +55,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cc" -version = "1.0.90" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cfg-if" @@ -79,18 +73,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "desmume-rs" @@ -116,9 +110,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding" @@ -186,9 +180,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys", @@ -196,9 +190,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "funty" @@ -234,48 +228,48 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[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 = "locale_config" @@ -290,21 +284,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -317,15 +301,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -338,14 +322,14 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -407,34 +391,11 @@ dependencies = [ "syn 1.0.109", ] -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pkg-config" @@ -444,30 +405,30 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -477,9 +438,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -487,9 +448,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -497,9 +458,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443" dependencies = [ "arc-swap", "log", @@ -508,34 +469,34 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ "heck", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -546,20 +507,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -569,9 +521,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -580,17 +532,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -599,41 +551,35 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "scopeguard" -version = "1.2.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -642,8 +588,8 @@ dependencies = [ [[package]] name = "skytemple_rust" -version = "1.6.4" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +version = "1.8.1" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "bytes", "encoding", @@ -654,24 +600,16 @@ dependencies = [ "num-traits", "packed_struct", "paste", + "pyo3", + "pyo3-log", "skytemple_rust_macros", - "skytemple_rust_macros_no_py", "thiserror", ] [[package]] name = "skytemple_rust_macros" version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "skytemple_rust_macros_no_py" -version = "1.4.0" -source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.6.4#6b16478906fb35595fa4307c0ac77dea37e12983" +source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9" dependencies = [ "quote", "syn 1.0.109", @@ -679,7 +617,7 @@ dependencies = [ [[package]] name = "skytemple_ssb_emulator" -version = "1.6.4" +version = "1.8.0" dependencies = [ "byteorder", "crossbeam-channel", @@ -693,17 +631,11 @@ dependencies = [ "sprintf", ] -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - [[package]] name = "sprintf" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2819cb5194dfe9e6d102f4519a9fb9dc7106d2879b71b4fd4d4677f1175bd39" +checksum = "39b60413e681681e22dfe3966674082c075c5f6ed73c3900b95dd19eb9e0181d" dependencies = [ "thiserror", ] @@ -721,9 +653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -738,15 +670,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -762,22 +694,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.71", ] [[package]] @@ -820,122 +752,72 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.48.5" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "wyz" diff --git a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix index ad3fdd758bac5..8b5f71030667c 100644 --- a/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-emulator/default.nix @@ -2,7 +2,7 @@ alsa-lib, buildPythonPackage, cargo, - fetchPypi, + fetchFromGitHub, glib, lib, libpcap, @@ -21,18 +21,20 @@ }: buildPythonPackage rec { pname = "skytemple-ssb-emulator"; - version = "1.6.4"; + version = "1.8.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-qGRfX7Bwr19KJnIdhwuSVBZzXxMJyEgyBuy91aLhEj4="; + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + hash = "sha256-9xD9Q/oYsi9tuxTOJ6ItLbWkqAjG78uzXYZXOiITDEA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "skytemple_rust-1.6.4" = "sha256-t7P3F1zes7bgDu2JGqb5DgxlDCiztWtmViy4QY9CzT0="; + "skytemple_rust-1.8.1" = "sha256-KtMqgUOlyF02msQRouE4NpvCHqahY+aRiRV9P32ASqg="; }; }; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index da906793d206d..5c2c1aff4b3b2 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1248"; + version = "3.0.1249"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-w0iM9Pq3A7uJ3Q29Oo+YEhN2vPNJINjCwIoGaDwHK2A="; + hash = "sha256-I3/nEiCgZaAX32Kj2w+qWPwL5frxOdpLGF7dzBsptr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index e1ef6e67796ad..73cd3f3dcbfc7 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM="; + hash = "sha256-cfvhTNUadx7zRmDPAv9Djsx+jWgBIAf9dMmwop/8oa0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7e6986f2a95ac..44e9fcaabd3c5 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.2.0.20240913"; + version = "2024.2.0.20241003"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; + hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 4d873e9590f5c..5071804395891 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,46 +4,43 @@ fetchFromGitHub, setuptools, icalendar, - pytz, + tzdata, pytestCheckHook, restructuredtext-lint, pygments, + pytz, }: buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.7"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-itqsVYYUcpbKTh0BM6IHk6F9xhB+pAQnnJsnZAVpNL4="; + hash = "sha256-MDFniFhgRuNtYITH/IUUP/HHC79coqxgXrlErj+Yrcs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar - pytz + tzdata ]; nativeCheckInputs = [ pytestCheckHook restructuredtext-lint pygments + pytz ]; preCheck = '' export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_input_to_output" - "test_output_stays_the_same" - ]; - pythonImportsCheck = [ "x_wr_timezone" ]; meta = { diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a0abc6074a35b..2696b25743261 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.07.0"; + version = "2024.09.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-pt0qnkgf3E/QQHQAaZLommakhqEJ4NuTyjx5tdk2N1U="; + hash = "sha256-ZrqdpzcNjZMxET355PRWQaUPjvFm+m2y71F7qt8DCjg="; }; build-system = [ @@ -42,10 +42,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "xarray" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + doronbehar + ]; }; } diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 13f16c9171b6e..489181187c4e9 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, grpc -, protobuf -, openssl -, nlohmann_json -, gtest -, spdlog -, c-ares -, zlib -, sqlite -, re2 -, lit -, python3 -, coreutils +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + grpc, + protobuf_25, + openssl, + nlohmann_json, + gtest, + spdlog, + c-ares, + zlib, + sqlite, + re2, + lit, + python3, + coreutils, }: stdenv.mkDerivation rec { @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ grpc - protobuf + protobuf_25 openssl nlohmann_json gtest diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index aecc3fb96521e..78172cb932a9d 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.4"; + version = "0.11.6"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; rev = "mask/${version}"; - hash = "sha256-pi8dD4Fko39yn1maXNOqm+aDWYJhxE/b4kH7H18InbY="; + hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; - cargoHash = "sha256-zbvYSTR0m7S4m0WFQrCqCrMXqMcDW2oIMznD5PDdeHE="; + cargoHash = "sha256-bhf6+nUxg4yIQIjiQYFdtPPF1crFVsofHdEsIOpiH2Q="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 68e29724eb007..8b0026fdf4412 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,21 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ="; + hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY="; }; - cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo="; + cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ="; + + # https://github.com/latex-lsp/texlab/pull/1237 + preBuild = '' + rm .cargo/config.toml + ''; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +46,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.16.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index f7b24266123f1..eb6d5bff00263 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; + hash = "sha256-bQYKOo11zVIXNHdoD60oEdzSSYeLKppPJBen6wdrXq8="; }; - cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; + cargoHash = "sha256-Tr++ui715adP1taqj+Sms2yO3hF5SZl7zCrAkPYlSdY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index ab09e4efed406..cc32d13617dc1 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , SDL2 , autoconf +, autoconf-archive +, autoreconfHook , automake , libogg , libtool @@ -10,21 +12,31 @@ , pkg-config , zlib , enableTools ? false +# Darwin-specific +, AudioUnit }: stdenv.mkDerivation rec { pname = "exult"; - version = "1.8"; + version = "1.10.1"; src = fetchFromGitHub { owner = "exult"; repo = "exult"; rev = "v${version}"; - hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E="; + hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE="; }; + # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin + postPatch = '' + substituteInPlace macosx/macosx.am \ + --replace-fail DESTDIR NIX_DESTDIR + ''; + nativeBuildInputs = [ autoconf + autoconf-archive + autoreconfHook automake libtool pkg-config @@ -35,12 +47,13 @@ stdenv.mkDerivation rec { libogg libvorbis zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit ]; - preConfigure = '' - ./autogen.sh - ''; + enableParallelBuilding = true; + makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch configureFlags = lib.optional (!enableTools) "--disable-tools"; meta = with lib; { @@ -58,5 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://exult.info"; license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi ]; + mainProgram = "exult"; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f4ccf5ac71e9b..de566217b1baa 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_SERVER" buildServer) + (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) (lib.cmakeBool "USE_SDL2" useSDL2) # Ensure we use system libraries @@ -91,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { gmp libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv OpenGL OpenAL @@ -118,7 +119,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace src/filesys.cpp \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt ''; @@ -130,6 +132,8 @@ stdenv.mkDerivation (finalAttrs: { mv $out/minetest.app $out/Applications ''; + doCheck = true; + passthru.updateScript = gitUpdater { allowedVersions = "\\."; ignoredVersions = "-android$"; @@ -141,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; + mainProgram = if buildClient then "minetest" else "minetestserver"; }; }) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 3998a5a940dab..ae66125fddf4c 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + hash = "sha256-YkIBYlTvweSg4CMqj+sHoNyZJXuwpCAMNZUZUyH2dYE="; }; extraBuildInputs = [ diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 66b7321c780dc..83ce454935f27 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "riscv-pk"; - version = "1.0.0"; + version = "1.0.0-unstable-2024-10-09"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-pk"; - rev = "v${version}"; - sha256 = "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz"; + rev = "abadfdc507d5a75b6272dc360e70a80a510c758a"; + sha256 = "sha256-02qcj0TAs7g4CSorWWbUzouS6mNthUOSdeocibw5g2A="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; + # pk by default installs things in $out/$target_prefix/{bin,include,lib}, + # we want to remove the target prefix directory hierarchy postInstall = '' mv $out/* $out/.cleanup mv $out/.cleanup/* $out diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index b1ad7ce0410c4..35978f1b66923 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4 cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg + cp -av sof-ipc4-lib $out/lib/firmware/intel/sof-ipc4-lib runHook postInstall ''; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index c5bc19f82980f..698fb4192252b 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -102,21 +102,32 @@ while [ "$#" -gt 0 ]; do --use-substitutes|--substitute-on-destination|-s) copyFlags+=("-s") ;; - -I|--max-jobs|-j|--cores|--builders|--log-format) + --builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + --I|--max-jobs|-j|--cores|--log-format) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + copyFlags+=("$i" "$j") + ;; + --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q|--show-trace|--refresh|--impure|--offline|--no-net) + extraBuildFlags+=("$i") + ;; + --keep-going|-k|--keep-failed|-K|--fallback|--repair) extraBuildFlags+=("$i") + copyFlags+=("$i") ;; --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) verboseScript="true" extraBuildFlags+=("$i") + copyFlags+=("$i") ;; --option) j="$1"; shift 1 k="$1"; shift 1 extraBuildFlags+=("$i" "$j" "$k") + copyFlags+=("$i" "$j" "$k") ;; --fast) buildNix= diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 5c3c5df262105..26f060676d39a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736"; + sha256 = "252a2b83a9319a605103f7491d73a881e97c63339d09170ac9d525155fa41b1a"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 5f93c55867199..1b33d907afed2 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,11 +1,11 @@ { lib , stdenv -, buildGo123Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert , git -, go_1_23 +, go , enumer , mockgen , nodejs @@ -14,22 +14,22 @@ , nixosTests }: -buildGo123Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.130.9"; + version = "0.130.13"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-g3z2yqw/84OMui5mchfqVHoR/6LdwNHgeBodf1jUtj4="; + hash = "sha256-cqw+4/GwdBy8XpAF/ViI5UxaaS17hryJSCw5kMLin4k="; }; - vendorHash = "sha256-C2eoNmv0GSi5DV53aUwGcBOw6n2btU/HhniMyu21vLE="; + vendorHash = "sha256-WP7ao54/PMLI+jAaZQgj1otCHEPHZd1A3oqb0DTgx1c="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q="; + hash = "sha256-pec5hsPrvHHTg++NaLb7vL1YIU1e57o8EVxp9OMhm58="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildGo123Module rec { overrideModAttrs = _: { nativeBuildInputs = [ enumer - go_1_23 + go git cacert mockgen @@ -74,6 +74,7 @@ buildGo123Module rec { # network access "TestOctopusConfigParse" "TestTemplates" + "TestOcpp" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 8210e252bdab8..73b23ce6f9407 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.32.7"; + version = "3.32.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-7kVT/aBL9EAx7oGeXEY9eL72dZGtuJUGlQ7bPyt/JZg="; + hash = "sha256-dgaSFTrBg3CM320M75AA2qQaKDkh3LycNqNgO8ewSrw="; }; patches = [ diff --git a/pkgs/servers/sql/percona-server/lts.nix b/pkgs/servers/sql/percona-server/8_0.nix similarity index 60% rename from pkgs/servers/sql/percona-server/lts.nix rename to pkgs/servers/sql/percona-server/8_0.nix index 352b0239c429c..1d1a64e31643c 100644 --- a/pkgs/servers/sql/percona-server/lts.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -1,24 +1,63 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -# Percona-specific deps -, cyrus_sasl, gnumake, openldap +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, }: stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_lts"; - version = "8.0.36-28"; + pname = "percona-server"; + version = "8.0.37-29"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ="; + hash = "sha256-zZgq3AxCRYdte3dTUJiuMvVGdl9U01s8jxcAqDxZiNM="; }; nativeBuildInputs = [ - bison cmake pkg-config makeWrapper + bison + cmake + pkg-config + makeWrapper # required for scripts/CMakeLists.txt - coreutils gnugrep procps + coreutils + gnugrep + procps ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ @@ -36,16 +75,41 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" ''; - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ]; + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ]; - outputs = [ "out" "static" ]; + outputs = [ + "out" + "static" + ]; cmakeFlags = [ # Percona-specific flags. @@ -78,11 +142,39 @@ stdenv.mkDerivation (finalAttrs: { so=${stdenv.hostPlatform.extensions.sharedLibrary} ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } ''; passthru = { @@ -98,8 +190,9 @@ stdenv.mkDerivation (finalAttrs: { description = '' A free, fully compatible, enhanced, open source drop-in replacement for MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. ''; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; maintainers = teams.flyingcircus.members; platforms = platforms.unix; }; diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix new file mode 100644 index 0000000000000..0b68f84d4b129 --- /dev/null +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -0,0 +1,221 @@ +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + systemd, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, + # optional: different malloc implementations + withJemalloc ? false, + withTcmalloc ? false, + jemalloc, + gperftools, +}: + +assert !(withJemalloc && withTcmalloc); + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server"; + version = "8.4.0-1"; + + src = fetchurl { + url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + hash = "sha256-76PXXqTNBVsD7RX2vhp7RyESiFpJL0h0zG9ucNfy3uQ="; + }; + + nativeBuildInputs = [ + bison + cmake + pkg-config + makeWrapper + # required for scripts/CMakeLists.txt + coreutils + gnugrep + procps + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + systemd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; + + outputs = [ + "out" + "static" + ]; + + cmakeFlags = + [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-DWITH_SYSTEMD=1" + "-DWITH_SYSTEMD_DEBUG=1" + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + + postInstall = + '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_innovation; + }; + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. + ''; + license = licenses.gpl2Only; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix index 002765a04cd9d..aaac48de68ff0 100644 --- a/pkgs/servers/sql/percona-server/default.nix +++ b/pkgs/servers/sql/percona-server/default.nix @@ -1,15 +1,18 @@ pkgs: { - percona-server_lts = pkgs.callPackage ./lts.nix { + # old lts + percona-server_8_0 = pkgs.callPackage ./8_0.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; boost = pkgs.boost177; # Configure checks for specific version. icu = pkgs.icu69; + # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; - percona-server_innovation = pkgs.callPackage ./innovation.nix { + percona-server_8_4 = pkgs.callPackage ./8_4.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; + percona-server = pkgs.percona-server_8_4; } diff --git a/pkgs/servers/sql/percona-server/innovation.nix b/pkgs/servers/sql/percona-server/innovation.nix deleted file mode 100644 index 61b2ff7bb4a10..0000000000000 --- a/pkgs/servers/sql/percona-server/innovation.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -, systemd -# Percona-specific deps -, cyrus_sasl, gnumake, openldap -# optional: different malloc implementations -, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools -}: - -assert !(withJemalloc && withTcmalloc); - - -stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_innovation"; - version = "8.3.0-1"; - - src = fetchurl { - url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg"; - }; - - nativeBuildInputs = [ - bison cmake pkg-config makeWrapper - # required for scripts/CMakeLists.txt - coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; - - patches = [ - ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch - ]; - - ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. - postPatch = '' - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool - # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. - patchShebangs storage/rocksdb/get_rocksdb_files.sh - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" - ''; - - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc systemd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; - - outputs = [ "out" "static" ]; - - cmakeFlags = [ - # Percona-specific flags. - "-DPORTABLE=1" - "-DWITH_LDAP=system" - "-DROCKSDB_DISABLE_AVX2=1" - "-DROCKSDB_DISABLE_MARCH_NATIVE=1" - - # Flags taken from mysql package. - "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. - "-DWITH_ROUTER=OFF" # It may be packaged separately. - "-DWITH_SYSTEM_LIBS=ON" - "-DWITH_UNIT_TESTS=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - - - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DWITH_SYSTEMD=1" - "-DWITH_SYSTEMD_DEBUG=1" - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; - - postInstall = '' - moveToOutput "lib/*.a" $static - so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - ''; - - passthru = { - client = finalAttrs.finalPackage; - connector-c = finalAttrs.finalPackage; - server = finalAttrs.finalPackage; - mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_innovation; - }; - - - meta = with lib; { - homepage = "https://www.percona.com/software/mysql-database/percona-server"; - description = '' - A free, fully compatible, enhanced, open source drop-in replacement for - MySQL® that provides superior performance, scalability and instrumentation. - ''; - license = licenses.gpl2; - maintainers = teams.flyingcircus.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index c22db465b2239..d86ff503e8039 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,13 +1,15 @@ -{ lib -, fetchFromGitHub -, python3Packages -, nixosTests +{ + fetchFromGitHub, + fetchpatch2, + lib, + nixosTests, + python3Packages, }: python3Packages.buildPythonApplication rec { pname = "xandikos"; version = "0.2.11"; - format = "pyproject"; + pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,12 +20,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI="; }; - nativeBuildInputs = with python3Packages; [ + patches = [ + (fetchpatch2 { + name = "fix-compatibility-with-icalendar-v6.patch"; + url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch"; + excludes = [ "requirements.txt" ]; + hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU="; + }) + ]; + + build-system = with python3Packages; [ setuptools - wheel ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ aiohttp aiohttp-openmetrics dulwich @@ -31,6 +41,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict + pytz vobject ]; diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 981f1d208e117..f0af1af66081e 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nu-plugin-net"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; rev = "refs/tags/${version}"; - hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I="; + hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; }; - cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4="; + cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix new file mode 100644 index 0000000000000..c9822f1ec84c8 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -0,0 +1,20 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + args + // { + version = "8.0.35-31"; + hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = [ + ./abi-check.patch + ]; + + extraPostInstall = '' + rm -r "$out"/docs + ''; + } +) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix new file mode 100644 index 0000000000000..0bfcbb12e2362 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -0,0 +1,18 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + args + // { + version = "8.4.0-1"; + hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = + [ + ]; + + extraPostInstall = ''''; + } +) diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index f3466dc9f165f..9fd2e627c17e5 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,6 +1,7 @@ pkgs: { - percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix { boost = pkgs.boost177; }; - percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; + percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { }; + percona-xtrabackup = pkgs.percona-xtrabackup_8_4; } diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index d81dee6f97f66..3f4cdd86cf10a 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,8 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config -, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 -, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib -, perlPackages -, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +{ + lib, + stdenv, + fetchFromGitHub, + bison, + boost, + cmake, + makeWrapper, + pkg-config, + curl, + cyrus_sasl, + libaio, + libedit, + libev, + libevent, + libgcrypt, + libgpg-error, + lz4, + ncurses, + numactl, + openssl, + procps, + protobuf, + valgrind, + xxd, + zlib, + perlPackages, + version, + hash, + fetchSubmodules ? false, + extraPatches ? [ ], + extraPostInstall ? "", + ... }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +44,39 @@ stdenv.mkDerivation (finalAttrs: { inherit hash fetchSubmodules; }; - nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ + bison + boost + cmake + makeWrapper + pkg-config + ]; - buildInputs = [ - (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 - ncurses numactl openssl procps protobuf valgrind xxd zlib - ] ++ (with perlPackages; [ perl DBI DBDmysql ]); + buildInputs = + [ + (curl.override { inherit openssl; }) + cyrus_sasl + libaio + libedit + libevent + libev + libgcrypt + libgpg-error + lz4 + ncurses + numactl + openssl + procps + protobuf + valgrind + xxd + zlib + ] + ++ (with perlPackages; [ + perl + DBI + DBDmysql + ]); patches = extraPatches; @@ -42,17 +97,19 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_MAN_PAGES=OFF" ]; - postInstall = '' - wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB - rm -r "$out"/lib/plugin/debug - '' + extraPostInstall; + postInstall = + '' + wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB + rm -r "$out"/lib/plugin/debug + '' + + extraPostInstall; passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version; meta = with lib; { description = "Non-blocking backup tool for MySQL"; homepage = "http://www.percona.com/software/percona-xtrabackup"; - license = licenses.lgpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; diff --git a/pkgs/tools/backup/percona-xtrabackup/innovation.nix b/pkgs/tools/backup/percona-xtrabackup/innovation.nix deleted file mode 100644 index 003df8aa6b505..0000000000000 --- a/pkgs/tools/backup/percona-xtrabackup/innovation.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "8.3.0-1"; - hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY="; - - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; - - extraPatches = [ - ]; - - extraPostInstall = '' - ''; -}) diff --git a/pkgs/tools/backup/percona-xtrabackup/lts.nix b/pkgs/tools/backup/percona-xtrabackup/lts.nix deleted file mode 100644 index fbb4c045d776f..0000000000000 --- a/pkgs/tools/backup/percona-xtrabackup/lts.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "8.0.35-30"; - hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo="; - - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; - - extraPatches = [ - ./abi-check.patch - ]; - - extraPostInstall = '' - rm -r "$out"/docs - ''; -}) diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 8e31710ff324a..e3969844d8ac0 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "apkeep"; - version = "0.16.0"; + version = "0.17.0"; src = fetchCrate { inherit pname version; - hash = "sha256-nPeXIzy9tYWeJrq1tIKXMILOjVnsAvsceY5dzz7+pYE="; + hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8="; }; - cargoHash = "sha256-0NyZmZ00zmGfndz47NMeh76SMmh0ap6ZfkKebX7pMfw="; + cargoHash = "sha256-Fx/XNmml/5opekmH1qs/f3sD45KWfNZjdOxTuNJfZiw="; prePatch = '' rm .cargo/config.toml diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix deleted file mode 100644 index 9d3a7c4074fee..0000000000000 --- a/pkgs/tools/misc/fcp/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "fcp"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "svetlitski"; - repo = pname; - rev = "v${version}"; - sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; - }; - - cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8="; - - nativeBuildInputs = [ expect ]; - - # character_device fails with "File name too long" on darwin - doCheck = !stdenv.hostPlatform.isDarwin; - - postPatch = '' - patchShebangs tests/*.exp - ''; - - meta = with lib; { - description = "Significantly faster alternative to the classic Unix cp(1) command"; - homepage = "https://github.com/svetlitski/fcp"; - changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "fcp"; - }; -} diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index ace598e053b7f..6964083e631ce 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -1,18 +1,20 @@ -{ lib -, nix-update-script -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -, coreutils -, bash -, pkg-config -, openssl -, direnv -, Security -, SystemConfiguration -, mise -, testers +{ + lib, + nix-update-script, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + coreutils, + bash, + pkg-config, + openssl, + direnv, + Security, + SystemConfiguration, + usage, + mise, + testers, }: rustPlatform.buildRustPackage rec { @@ -34,8 +36,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + ]; postPatch = '' patchShebangs --build \ @@ -70,6 +80,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage ./man/man1/mise.1 + substituteInPlace ./completions/{mise.bash,mise.fish,_mise} \ + --replace-fail '-v usage' '-v ${usage}/bin/usage' \ + --replace-fail 'usage complete-word' '${usage}/bin/usage complete-word' + installShellCompletion \ --bash ./completions/mise.bash \ --fish ./completions/mise.fish \ diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index d8749c4115c85..e60ef9fb4c50f 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -11,7 +11,7 @@ let name = "tmux-sessionizer"; - version = "0.4.2"; + version = "0.4.3"; in rustPlatform.buildRustPackage { @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "jrmoulton"; repo = name; rev = "v${version}"; - hash = "sha256-n6DXqsq3TsNob/fEqeOwNTVLPAvCr7CDN9qtXAiOMWQ="; + hash = "sha256-wwu3h2eQrim/RbxTYqt+EnFmn0uD6PQzo1Xs1qCVQ3o="; }; - cargoHash = "sha256-e2U6x7HFoFbZxtJvY/ZpgEWagIrdRxPVZw2rP5aDIqg="; + cargoHash = "sha256-5OIiDz66GD3DrNKzxH+bpyweS7Ycn2IOf4f9mdHAaCo="; passthru.tests.version = testers.testVersion { package = tmux-sessionizer; diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 7ff660e8247ce..75fb358ce44e0 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.18"; + version = "1.8.19"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-QSwZhdBXO+x4vcwRnZjdYdIdWW0Nfu0oImftUgm4wyo="; + sha256 = "sha256-XGDnEKyuvoDzaJINV8ePafKfePc3fYP6vQMqtH1yo4k="; }; dontBuild = true; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 995637e61d1d8..648991ef73e0e 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.8.0"; + version = "7.9.0"; pname = "openapi-generator-cli"; jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-0Yec9C2jH4z2HPaHmLjvJBivDGvZOlwYcOH/VD+7k2U="; + sha256 = "sha256-8Mt4OaLq2QQLIEUZsD8Uc7OcdyX9H0MTS7VQUVyz2+4="; }; dontUnpack = true; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index fe2cf57d19cf8..f1af411fa5a05 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.1"; + version = "2.19.2"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-V2ZcXgRtL8zkCx5/d+L+3o0QQHVrPpFyjvjsc2auWDI="; + hash = "sha256-m+ZVaAZZ4+/qqJs3B8/CEj+in/mrBKgfrx1OD3GpXLU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index fcc23229a9c12..a0ba2eafcace4 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.26"; + version = "1.27"; src = fetchgit { url = "https://salsa.debian.org/debian/${pname}.git"; rev = "debian/${version}"; - hash = "sha256-CVy5mOX3jNM1cNIn8HhVs8Mhh70pkz9pG08muFuPNfk="; + hash = "sha256-BN/Ct1FRZjvpkRCPpRlXmjeRvrNnuJBXwwI1P2HCisc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 203531d0ef647..c8a729a5afe43 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -53,7 +53,7 @@ let stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.3"; + version = "1.47.4"; pname = "netdata"; src = fetchFromGitHub { @@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = if withCloudUi then - "sha256-rua4wDkTEQbH5fS6gVDF0y3QsQ+eG8Eki4JFxmiRN5k=" + "sha256-PCaY6J3X4zUUJ8kRCGmLLbk2Pkp5CnH3rxOaoAdsKG4=" # we delete the v2 GUI after fetching else - "sha256-IR54OgYiOAmDgysm+3MLeMkxyNWkJe3BLKL9gaFHdvo="; + "sha256-W4g/ns+XfBSf6iACIW+6lfzZJLMktTfe5/n3egL27XE="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3fd0f241dc6f9..3a78a94a56230 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1245,9 +1245,11 @@ mapAliases { pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 + percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 + percona-server_lts = percona-server; # Added 2024-10-13 + percona-xtrabackup_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13 + percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 - percona-server_8_0 = percona-server_lts; # Added 2024-05-07 - percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9e5eb64e4c3..491f6c861dea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5607,6 +5607,10 @@ with pkgs; nltk-data = callPackage ../tools/text/nltk-data { }; + seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; + seabios-csm = seabios.override { ___build-type = "csm"; }; + seabios-qemu = seabios.override { ___build-type = "qemu"; }; + seaborn-data = callPackage ../tools/misc/seaborn-data { }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; @@ -10998,10 +11002,8 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; - percona-server = percona-server_lts; - inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; - percona-xtrabackup = percona-xtrabackup_lts; + inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup; pick = callPackage ../tools/misc/pick { }; @@ -29352,8 +29354,6 @@ with pkgs; fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { }; - fcp = callPackage ../tools/misc/fcp { }; - fdupes = callPackage ../tools/misc/fdupes { }; feh = callPackage ../applications/graphics/feh { @@ -34617,7 +34617,9 @@ with pkgs; extremetuxracer = callPackage ../games/extremetuxracer { }; - exult = callPackage ../games/exult { }; + exult = callPackage ../games/exult { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; fallout-ce = callPackage ../games/fallout-ce/fallout-ce.nix { }; fallout2-ce = callPackage ../games/fallout-ce/fallout2-ce.nix { };