diff options
133 files changed, 1796 insertions, 2911 deletions
diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 1a09491649d7f..8bef293769e58 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ```nix { lib , stdenv -, zig_0_11 +, zig }: stdenv.mkDerivation { # . . . nativeBuildInputs = [ - zig_0_11.hook + zig.hook ]; zigBuildFlags = [ "-Dman-pages=true" ]; diff --git a/lib/licenses.nix b/lib/licenses.nix index 49c7a4a353ecb..7d2a22bc25a47 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -632,6 +632,11 @@ in mkLicense lset) ({ url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; + icu = { + spdxId = "ICU"; + fullName = "ICU"; + }; + ijg = { spdxId = "IJG"; fullName = "Independent JPEG Group License"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b3fa7d35bd4fc..50736f0f27801 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -429,6 +429,12 @@ githubId = 1517066; name = "Aiken Cairncross"; }; + a-camarillo = { + name = "Anthony Camarillo"; + email = "anthony.camarillo.96@gmail.com"; + github = "a-camarillo"; + githubId = 58638902; + }; aciceri = { name = "Andrea Ciceri"; email = "andrea.ciceri@autistici.org"; @@ -2943,6 +2949,12 @@ fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; }]; }; + b-rodrigues = { + email = "bruno@brodrigues.co"; + github = "b-rodrigues"; + githubId = 2998834; + name = "Bruno Rodrigues"; + }; broke = { email = "broke@in-fucking.space"; github = "broke"; @@ -3018,6 +3030,12 @@ githubId = 37375448; name = "Buildit"; }; + buurro = { + email = "marcoburro98@gmail.com"; + github = "buurro"; + githubId = 9320677; + name = "Marco Burro"; + }; bwc9876 = { email = "bwc9876@gmail.com"; github = "Bwc9876"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 08aa297a7c109..96ab9d94a1696 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -854,8 +854,10 @@ with lib.maintainers; { r = { members = [ + b-rodrigues bcdarwin jbedo + kupac ]; scope = "Maintain the R programming language and related packages."; shortName = "R"; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index bc814ad305055..e3880d3deec53 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -92,6 +92,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition. +- [clatd](https://github.com/toreanderson/clatd), a a CLAT / SIIT-DC Edge Relay implementation for Linux. + - [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable) - [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 90a2170349e93..111b5c129cb3c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -946,6 +946,7 @@ ./services/networking/charybdis.nix ./services/networking/chisel-server.nix ./services/networking/cjdns.nix + ./services/networking/clatd.nix ./services/networking/cloudflare-dyndns.nix ./services/networking/cloudflared.nix ./services/networking/cntlm.nix diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 43568f29dd376..7b96a182f0d94 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -18,6 +18,8 @@ let gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; + gitlabVersionAtLeast = version: lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) version; + databaseConfig = let val = { adapter = "postgresql"; @@ -27,10 +29,16 @@ let encoding = "utf8"; pool = cfg.databasePool; } // cfg.extraDatabaseConfig; - in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then { - production.main = val; - } else { - production = val; + in { + production = ( + if (gitlabVersionAtLeast "15.0") + then { main = val; } + else val + ) // lib.optionalAttrs (gitlabVersionAtLeast "15.9") { + ci = val // { + database_tasks = false; + }; + }; }; # We only want to create a database if we're actually going to connect to it. @@ -1168,7 +1176,7 @@ in { set -eu PSQL() { - psql --port=${toString pgsql.port} "$@" + psql --port=${toString pgsql.settings.port} "$@" } PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' @@ -1348,7 +1356,7 @@ in { rm -f '${cfg.statePath}/config/database.yml' - ${if cfg.databasePasswordFile != null then '' + ${lib.optionalString (cfg.databasePasswordFile != null) '' db_password="$(<'${cfg.databasePasswordFile}')" export db_password @@ -1356,16 +1364,24 @@ in { >&2 echo "Database password was an empty string!" exit 1 fi + ''} - jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - '.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \ - >'${cfg.statePath}/config/database.yml' - '' - else '' - jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \ - >'${cfg.statePath}/config/database.yml' - '' - } + # GitLab expects the `production.main` section to be the first entry in the file. + jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} '{ + production: [ + ${lib.optionalString (cfg.databasePasswordFile != null) ( + builtins.concatStringsSep "\n " ( + [ ".production${lib.optionalString (gitlabVersionAtLeast "15.0") ".main"}.password = $ENV.db_password" ] + ++ lib.optional (gitlabVersionAtLeast "15.9") "| .production.ci.password = $ENV.db_password" + ++ [ "|" ] + ) + )} .production + | to_entries[] + ] + | sort_by(.key) + | reverse + | from_entries + }' >'${cfg.statePath}/config/database.yml' ${utils.genJqSecretsReplacementSnippet gitlabConfig diff --git a/nixos/modules/services/networking/clatd.nix b/nixos/modules/services/networking/clatd.nix new file mode 100644 index 0000000000000..76e0c130ca466 --- /dev/null +++ b/nixos/modules/services/networking/clatd.nix @@ -0,0 +1,82 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.clatd; + + settingsFormat = pkgs.formats.keyValue {}; + + configFile = settingsFormat.generate "clatd.conf" cfg.settings; +in +{ + options = { + services.clatd = { + enable = mkEnableOption "clatd"; + + package = mkPackageOption pkgs "clatd" { }; + + settings = mkOption { + type = types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + }); + default = { }; + example = literalExpression '' + { + plat-prefix = "64:ff9b::/96"; + } + ''; + description = '' + Configuration of clatd. See [clatd Documentation](https://github.com/toreanderson/clatd/blob/master/README.pod#configuration). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.clatd = { + description = "464XLAT CLAT daemon"; + documentation = [ "man:clatd(8)" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + startLimitIntervalSec = 0; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/clatd -c ${configFile}"; + startLimitIntervalSec = 0; + + # Hardening + CapabilityBoundingSet = [ + "CAP_NET_ADMIN" + ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectProc = "invisible"; + ProtectSystem = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@network-io" + "@system-service" + "~@privileged" + "~@resources" + ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/trust-dns.nix b/nixos/modules/services/networking/trust-dns.nix index e6f8cc15819f6..039b7de263504 100644 --- a/nixos/modules/services/networking/trust-dns.nix +++ b/nixos/modules/services/networking/trust-dns.nix @@ -51,7 +51,7 @@ in package = mkPackageOption pkgs "trust-dns" { extraDescription = '' ::: {.note} - The package must provide `meta.mainProgram` which names the server binayr; any other utilities (client, resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ::: ''; }; @@ -86,7 +86,7 @@ in type = types.listOf types.str; default = [ "0.0.0.0" ]; description = '' - List of ipv4 addresses on which to listen for DNS queries. + List of ipv4 addresses on which to listen for DNS queries. ''; }; listen_addrs_ipv6 = mkOption { @@ -114,7 +114,7 @@ in }; zones = mkOption { description = "List of zones to serve."; - default = {}; + default = []; type = types.listOf (types.coercedTo types.str (zone: { inherit zone; }) zoneType); }; }; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index fe340cfaedb67..9c36651d68747 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -6,7 +6,6 @@ let concatMap concatMapStrings concatStrings - concatStringsSep escapeShellArg flip foldr @@ -491,10 +490,10 @@ in theme = mkOption { type = types.nullOr types.path; - example = literalExpression "pkgs.nixos-grub2-theme"; + example = literalExpression ''"''${pkgs.libsForQt5.breeze-grub}/grub/themes/breeze"''; default = null; description = '' - Grub theme to be used. + Path to the grub theme to be used. ''; }; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 4b1b67ac9444e..deb0b4d2c5bd7 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -219,6 +219,11 @@ in systemd.services.podman.environment = config.networking.proxy.envVars; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; + # Podman does not support multiple sockets, as of podman 5.0.2, so we use + # a symlink. Unfortunately this does not let us use an alternate group, + # such as `docker`. + systemd.sockets.podman.socketConfig.Symlinks = + lib.mkIf cfg.dockerSocket.enable [ "/run/docker.sock" ]; systemd.user.services.podman.environment = config.networking.proxy.envVars; systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; @@ -239,11 +244,6 @@ in '') ]; - systemd.tmpfiles.rules = - lib.optionals cfg.dockerSocket.enable [ - "L! /run/docker.sock - - - - /run/podman/podman.sock" - ]; - users.groups.podman = { }; assertions = [ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8de741a7c9c98..d4da32c44990f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -193,6 +193,7 @@ in { cinnamon = handleTest ./cinnamon.nix {}; cinnamon-wayland = handleTest ./cinnamon-wayland.nix {}; cjdns = handleTest ./cjdns.nix {}; + clatd = handleTest ./clatd.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; diff --git a/nixos/tests/clatd.nix b/nixos/tests/clatd.nix new file mode 100644 index 0000000000000..00021d87ba5f4 --- /dev/null +++ b/nixos/tests/clatd.nix @@ -0,0 +1,189 @@ +# This test verifies that we can ping an IPv4-only server from an IPv6-only +# client via a NAT64 router using CLAT on the client. The hosts and networks +# are configured as follows: +# +# +------ +# Client | clat Address: 192.0.0.1/32 (configured via clatd) +# | Route: default +# | +# | eth1 Address: 2001:db8::2/64 +# | | Route: default via 2001:db8::1 +# +--|--- +# | VLAN 3 +# +--|--- +# | eth2 Address: 2001:db8::1/64 +# Router | +# | nat64 Address: 64:ff9b::1/128 +# | Route: 64:ff9b::/96 +# | Address: 192.0.2.0/32 +# | Route: 192.0.2.0/24 +# | +# | eth1 Address: 100.64.0.1/24 +# +--|--- +# | VLAN 2 +# +--|--- +# Server | eth1 Address: 100.64.0.2/24 +# | Route: 192.0.2.0/24 via 100.64.0.1 +# +------ + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "clatd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = { + # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 + # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the + # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of + # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from + # RFC 6589 (Carrier Grade NAT) is used here. + # To reach the IPv4 address pool of the NAT64 gateway, there is a static + # route configured. In normal cases, where the router would also source NAT + # the pool addresses to one IPv4 addresses, this would not be needed. + server = { + virtualisation.vlans = [ + 2 # towards router + ]; + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "100.64.0.2/24" + ]; + routes = [ + { routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; } + ]; + }; + }; + }; + + # The router is configured with static IPv4 addresses towards the server + # and IPv6 addresses towards the client. For NAT64, the Well-Known prefix + # 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the + # tun-interface nat64 and does the translation over it. The IPv6 packets + # are sent to this interfaces and received as IPv4 packets and vice versa. + # As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it + # needs a pool of IPv4 addresses which must be at least as big as the + # expected amount of clients. In this test, the packets from the pool are + # directly routed towards the client. In normal cases, there would be a + # second source NAT44 to map all clients behind one IPv4 address. + router = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + # The client is configured with static IPv6 addresses. It has also a static + # default route towards the router. To reach the IPv4-only server, the + # client starts the clat daemon which starts and configures the local + # IPv4 -> IPv6 translation via Tayga. + client = { + virtualisation.vlans = [ + 3 # towards router + ]; + + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "2001:db8::2/64" + ]; + routes = [ + { routeConfig = { Destination = "::/0"; Gateway = "2001:db8::1"; }; } + ]; + }; + }; + + services.clatd = { + enable = true; + settings.plat-prefix = "64:ff9b::/96"; + }; + + environment.systemPackages = [ pkgs.mtr ]; + }; + }; + + testScript = '' + start_all() + + # wait for all machines to start up + for machine in client, router, server: + machine.wait_for_unit("network-online.target") + + with subtest("Wait for tayga and clatd"): + router.wait_for_unit("tayga.service") + client.wait_for_unit("clatd.service") + # clatd checks if this system has IPv4 connectivity for 10 seconds + client.wait_until_succeeds( + 'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"' + ) + + with subtest("Test ICMP"): + client.wait_until_succeeds("ping -c 3 100.64.0.2 >&2") + + with subtest("Test ICMP and show a traceroute"): + client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2") + + client.log(client.execute("systemd-analyze security clatd.service")[1]) + ''; +}) diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch deleted file mode 100644 index 84115e1480e13..0000000000000 --- a/pkgs/applications/audio/cmus/option-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -Shows build and link errors in configure for ease of debugging which -options require what. -diff --git a/scripts/checks.sh b/scripts/checks.sh -index 64cbbf3..fab4d9b 100644 ---- a/scripts/checks.sh -+++ b/scripts/checks.sh -@@ -425,7 +425,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" -- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CC -c $CFLAGS "$@" $__src -o $__obj - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -433,7 +433,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" -- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj - ;; - esac - return $? -@@ -451,7 +451,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" -- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null -+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -459,7 +459,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" -- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null -+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" - ;; - esac - return $? diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c086436de09ff..8f107ee2cb9c3 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -250,6 +250,7 @@ stdenv.mkDerivation rec { # no-derivatives clause license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ]; maintainers = with maintainers; [ nathyong jpotier ddelabru ]; + mainProgram = "Rack"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 1cc43a059e204..948645d60006b 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.2"; + version = "0.29.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-og9hMQdDXGdUQN+A+z0064E6svF+qPd9CWtDQsdvNYQ="; + hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5eb772dccf052..e477fa1f520ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5590,6 +5590,18 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; + llm-nvim = buildVimPlugin { + pname = "llm.nvim"; + version = "2024-02-22"; + src = fetchFromGitHub { + owner = "huggingface"; + repo = "llm.nvim"; + rev = "51b76dac9c33c0122adfe28daf52ceaa31c4aa02"; + sha256 = "07i1ixbiby4c81lkydwvygz6vxs1xhqnwzcsad3xzcaz7zdl00kx"; + }; + meta.homepage = "https://github.com/huggingface/llm.nvim/"; + }; + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2776640fdf594..faf446c70f415 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -468,6 +468,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cfb14bd2cfe73..260711bd4880b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -970,7 +970,7 @@ let version = "0.8.25"; } // sources.${stdenv.system}; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 12c86c3680f83..9ad54f00d4e8e 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,10 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , callPackage , patchelf -, unzip , poco , openssl , SDL2 @@ -16,18 +14,18 @@ }: let - version = "2.8.1"; + version = "2.8.2"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-8bl83AOIWtUQ06F2unYEF08VT13o9EGo9YDZpdNxd8w="; + hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-aCRJ3idSrRM8ydt8hP8nA1RR0etPnWpQKphXcOGgTfk="; + hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw="; }; in @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-iQCv4EDdqmnU0fYxMwpCZ2Z5p43P0MGBNIG/dZrWndg="; + hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 3715ef27524e9..2247344ba765a 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OzcoOIgEiadWrsUPIxBJTuZQYjScJBYKyqCu1or6fz8="; + hash = "sha256-nyq4BrpfbZwK/nOnB8ZEN1wlM8CssYVRvV7ytpX7k40="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index a378a7486b713..2d9b07a3f88dc 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,22 +14,22 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho="; + hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE="; }; - vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; + vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q="; ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace "/bin/stty" "${coreutils}/bin/stty" + --replace-fail "/bin/stty" "${coreutils}/bin/stty" ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index efd20632a2a31..7b2faa6b7d203 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -1,40 +1,27 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }: +{ lib +, appimageTools +, fetchurl }: -stdenv.mkDerivation rec { +appimageTools.wrapType2 rec { pname = "clockify"; - version = "2.1.6"; + version = "2.1.17.1354"; src = fetchurl { - url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; - hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; + url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage"; + hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA="; }; - nativeBuildInputs = [ - dpkg - makeWrapper - ]; + extraInstallCommands = + let appimageContents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} - dontBuild = true; - dontConfigure = true; + install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications + install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify/" "" - - makeWrapper ${electron}/bin/electron $out/bin/clockify \ - --add-flags $out/opt/Clockify/resources/app.asar - - runHook postInstall - ''; + substituteInPlace $out/share/applications/clockify.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "Free time tracker and timesheet app that lets you track work hours across projects"; diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index ac08d17397fa7..fdaa76f6f7e8e 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -58,6 +58,10 @@ let # may wish to wrap GR without python support. pythonPkgs = extraPythonPackages ++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] + ++ unwrapped.passthru.uhd.pythonPath + ++ lib.optionals (unwrapped.passthru.uhd.pythonPath != []) [ + (unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd) + ] # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index c3f7b58fa1ba6..947d7d48108d2 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -8,15 +8,8 @@ , boost , ncurses , enableCApi ? true -# Although we handle the Python API's dependencies in pythonEnvArg, this -# feature is currently disabled as upstream attempts to run `python setup.py -# install` by itself, and it fails because the Python's environment's prefix is -# not a writable directly. Adding support for this feature would require using -# python's pypa/build nad pypa/install hooks directly, and currently it is hard -# to do that because it all happens after a long buildPhase of the C API. -, enablePythonApi ? false +, enablePythonApi ? true , python3 -, buildPackages , enableExamples ? false , enableUtils ? true , libusb1 @@ -38,13 +31,7 @@ }: let - onOffBool = b: if b then "ON" else "OFF"; - inherit (lib) optionals; - # Later used in pythonEnv generation. Python + mako are always required for the build itself but not necessary for runtime. - pythonEnvArg = (ps: with ps; [ mako ] - ++ optionals (enablePythonApi) [ numpy setuptools ] - ++ optionals (enableUtils) [ requests six ] - ); + inherit (lib) optionals cmakeBool; in stdenv.mkDerivation (finalAttrs: { @@ -72,7 +59,30 @@ stdenv.mkDerivation (finalAttrs: { # hash. sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; }; + # This are the minimum required Python dependencies, this attribute might + # be useful if you want to build a development environment with a python + # interpreter able to import the uhd module. + pythonPath = optionals (enablePythonApi || enableUtils) [ + python3.pkgs.numpy + python3.pkgs.setuptools + ] ++ optionals (enableUtils) [ + python3.pkgs.requests + python3.pkgs.six + + /* These deps are needed for the usrp_hwd.py utility, however even if they + would have been added here, the utility wouldn't have worked because it + depends on an old python library mprpc that is not supported for Python > + 3.8. See also report upstream: + https://github.com/EttusResearch/uhd/issues/744 + + python3.pkgs.gevent + python3.pkgs.pyudev + python3.pkgs.pyroute2 + + */ + ]; passthru = { + runtimePython = python3.withPackages (ps: finalAttrs.pythonPath); updateScript = [ ./update.sh # Pass it this file name as argument @@ -83,66 +93,91 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" - "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases - "-DENABLE_EXAMPLES=${onOffBool enableExamples}" - "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_C_API=${onOffBool enableCApi}" - "-DENABLE_PYTHON_API=${onOffBool enablePythonApi}" - "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Regardless of doCheck, we want to build the tests to help us gain + # confident that the package is OK. + "-DENABLE_TESTS=ON" + (cmakeBool "ENABLE_EXAMPLES" enableExamples) + (cmakeBool "ENABLE_UTILS" enableUtils) + (cmakeBool "ENABLE_C_API" enableCApi) + (cmakeBool "ENABLE_PYTHON_API" enablePythonApi) + /* + + Otherwise python tests fail. Using a dedicated pythonEnv for either or both + nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to + install the Python API as reported on our end at [1] (we don't want + upstream to think we are in a virtual environment because we use + python3.withPackages...). + + Putting simply the python dependencies in the nativeBuildInputs and + buildInputs as they are now from some reason makes the `python` in the + checkPhase fail to find the python dependencies, as reported at [2]. Even + using nativeCheckInputs with the python dependencies, or using a + `python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the + `python` found in $PATH first is the one from nativeBuildInputs. + + [1]: https://github.com/NixOS/nixpkgs/pull/307435 + [2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/ + + Hence we use upstream's provided cmake flag to control which python + interpreter they will use to run the the python tests. + + */ + "-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}" + (cmakeBool "ENABLE_DPDK" enableDpdk) # Devices - "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" - "-DENABLE_MPMD=${onOffBool enableMpmd}" - "-DENABLE_B100=${onOffBool enableB100}" - "-DENABLE_B200=${onOffBool enableB200}" - "-DENABLE_USRP1=${onOffBool enableUsrp1}" - "-DENABLE_USRP2=${onOffBool enableUsrp2}" - "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N300=${onOffBool enableN300}" - "-DENABLE_N320=${onOffBool enableN320}" - "-DENABLE_E300=${onOffBool enableE300}" - "-DENABLE_E320=${onOffBool enableE320}" - ] + (cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock) + (cmakeBool "ENABLE_MPMD" enableMpmd) + (cmakeBool "ENABLE_B100" enableB100) + (cmakeBool "ENABLE_B200" enableB200) + (cmakeBool "ENABLE_USRP1" enableUsrp1) + (cmakeBool "ENABLE_USRP2" enableUsrp2) + (cmakeBool "ENABLE_X300" enableX300) + (cmakeBool "ENABLE_N300" enableN300) + (cmakeBool "ENABLE_N320" enableN320) + (cmakeBool "ENABLE_E300" enableE300) + (cmakeBool "ENABLE_E320" enableE320) # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; - - pythonEnv = python3.withPackages pythonEnvArg; + ] ++ optionals stdenv.isAarch32 [ + "-DCMAKE_CXX_FLAGS=-Wno-psabi" + ]; nativeBuildInputs = [ cmake pkg-config # Present both here and in buildInputs for cross compilation. - (buildPackages.python3.withPackages pythonEnvArg) + python3 + python3.pkgs.mako + # We add this unconditionally, but actually run wrapPythonPrograms only if + # python utilities are enabled + python3.pkgs.wrapPython ]; - buildInputs = [ + buildInputs = finalAttrs.pythonPath ++ [ boost libusb1 - ] - # However, if enableLibuhd_Python_api *or* enableUtils is on, we need - # pythonEnv for runtime as well. The utilities' runtime dependencies are - # handled at the environment - ++ optionals (enableExamples) [ ncurses ncurses.dev ] - ++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ] - ++ optionals (enableDpdk) [ dpdk ] - ; + ] ++ optionals (enableExamples) [ + ncurses ncurses.dev + ] ++ optionals (enableDpdk) [ + dpdk + ]; # many tests fails on darwin, according to ofborg doCheck = !stdenv.isDarwin; # Build only the host software preConfigure = "cd host"; - # TODO: Check if this still needed, perhaps relevant: - # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = [ - # Disable tests that fail in the sandbox + # Disable tests that fail in the sandbox, last checked at version 4.6.0.0 ./no-adapter-tests.patch ]; - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] - ; + postPhases = [ + "installFirmware" + "removeInstalledTests" + ] ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ + "moveUdevRules" + ]; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -162,6 +197,10 @@ stdenv.mkDerivation (finalAttrs: { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; + # Wrap the python utilities with our pythonPath definition + postFixup = lib.optionalString (enablePythonApi && enableUtils) '' + wrapPythonPrograms + ''; disallowedReferences = optionals (!enablePythonApi && !enableUtils) [ python3 ]; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 41deecbb62247..7619e43e80332 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -3,17 +3,18 @@ }: let + pname = "digital"; pkgDescription = "A digital logic designer and circuit simulator."; version = "0.30"; buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; - name = "Digital"; - desktopName = pkgDescription; + name = pname; + desktopName = "Digital"; comment = "Easy-to-use digital logic designer and circuit simulator"; - exec = "digital"; - icon = "digital"; + exec = pname; + icon = pname; categories = [ "Education" "Electronics" ]; mimeTypes = [ "text/x-digital" ]; terminal = false; @@ -28,8 +29,7 @@ let mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in maven.buildMavenPackage rec { - pname = "digital"; - inherit version jre; + inherit pname version jre; src = fetchFromGitHub { owner = "hneemann"; @@ -44,6 +44,8 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/share/java @@ -53,6 +55,13 @@ maven.buildMavenPackage rec { makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ --add-flags "-jar $out/share/java/Digital.jar" + + install -Dm644 src/main/svg/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg + for size in 16 32 48 64 128; do + install -Dm644 src/main/resources/icons/icon"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + + runHook postInstall ''; desktopItems = [ desktopItem ]; diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch deleted file mode 100644 index 91e080aa294a0..0000000000000 --- a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd -index 7794c9edc3..1753277b1f 100644 ---- a/src/sage/libs/linbox/conversion.pxd -+++ b/src/sage/libs/linbox/conversion.pxd -@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in - - v -- linbox vector - """ - cdef Vector_integer_dense res = P() -- cdef cppvector[Integer] * vec = &v.refRep() - cdef size_t i - for i in range(<size_t> res._degree): -- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) -+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) - - return res -diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd -index 9112d151f8..dcc482960c 100644 ---- a/src/sage/libs/linbox/linbox.pxd -+++ b/src/sage/libs/linbox/linbox.pxd -@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_double Field - ctypedef double Element - DenseMatrix_Modular_double(Field F, size_t m, size_t n) -- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_float Field - ctypedef float Element - DenseMatrix_Modular_float(Field F, size_t m, size_t n) -- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": - DenseVector_integer (Field &F) - DenseVector_integer (Field &F, long& m) - DenseVector_integer (Field &F, cppvector[Integer]&) -- cppvector[Element]& refRep() - size_t size() - void resize(size_t) - void resize(size_t n, const Element&) -diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi -index 010365d76f..3d60726ff9 100644 ---- a/src/sage/matrix/matrix_modn_dense_template.pxi -+++ b/src/sage/matrix/matrix_modn_dense_template.pxi -@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ - return 0,[] - - cdef ModField *F = new ModField(<long>modulus) -- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols) -+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries) - cdef Py_ssize_t r = reducedRowEchelonize(A[0]) - cdef Py_ssize_t i,j - for i in range(nrows): diff --git a/pkgs/applications/science/misc/gplates/boost-placeholders.patch b/pkgs/applications/science/misc/gplates/boost-placeholders.patch deleted file mode 100644 index 7166b92f646af..0000000000000 --- a/pkgs/applications/science/misc/gplates/boost-placeholders.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc ---- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200 -+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100 -@@ -3448,7 +3448,7 @@ - std::find_if( - d_visible_boundary_section_seq.begin(), - d_visible_boundary_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_boundary_section_seq.end()) -@@ -3467,7 +3467,7 @@ - std::find_if( - d_visible_interior_section_seq.begin(), - d_visible_interior_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_interior_section_seq.end()) -diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc ---- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100 -@@ -274,7 +274,7 @@ - GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params( - const ReconstructVisualLayerParams ¶ms) - { -- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2); -+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2); - d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error(); - d_render_params.fill_polygons = params.get_fill_polygons(); - d_render_params.fill_polylines = params.get_fill_polylines(); -diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc ---- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100 -@@ -448,7 +448,7 @@ - &GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create, - boost::bind( - &ReconstructScalarCoverageVisualLayerParams::create, -- _1), -+ boost::placeholders::_1), - true); - - registry.register_visual_layer_type( -@@ -498,7 +498,7 @@ - // NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from - // ViewportWindow, because ViewportWindow is not yet available (a reference to - // it not yet been initialised inside ViewState) so accessing it would crash... -- _1, boost::ref(view_state)), -+ boost::placeholders::_1, boost::ref(view_state)), - true); - - // DERIVED_DATA group. -@@ -549,7 +549,7 @@ - &GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create, - boost::bind( - &VelocityFieldCalculatorVisualLayerParams::create, -- _1, boost::cref(view_state.get_rendered_geometry_parameters())), -+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())), - true); - - using namespace GPlatesUtils; -diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc ---- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200 -+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100 -@@ -326,7 +326,7 @@ - *d_geometry_operation_state_ptr, - *d_modify_geometry_state, - *d_measure_distance_state_ptr, -- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1), -+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1), - get_view_state(), - *this); - diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch deleted file mode 100644 index 6e90faf9f0373..0000000000000 --- a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c4099..499be0a986 100644 ---- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index acfbbb48943d0..562e06176130c 100644 --- a/pkgs/applications/terminal-emulators/tym/default.nix +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = version; - sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA="; + sha256 = "sha256-53XAHyDiFPUTmw/rgoEoSoh+c/t4rS12gxwH1yKHqvw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-vanity-hash/default.nix index 915ef38307b2f..55332c6c7287b 100644 --- a/pkgs/applications/version-management/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-vanity-hash/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "git-vanity-hash"; version = "1.0.0"; src = fetchFromGitHub { owner = "prasmussen"; repo = "git-vanity-hash"; - rev = "v${version}"; - hash = "sha256-jD8cSFXf9UNBZ9d8JTnuwhs6nPHY/xGd5RyqF+mQOlo="; + # v1.0.0 + build fix + rev = "a80e7725ac6d0b7e6807cd7315cfdc7eaf0584f6"; + hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc="; }; - cargoHash = "sha256-8oW6gRtdQdmSmdwKlcU2EhHsyhk9hFhKl7RtsYwC7Ps="; + cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index cd61cfc9d0d44..ef30ed13784c0 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -12,15 +12,16 @@ , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; + repo = "showmethekey"; + rev = "refs/tags/v${version}"; + hash = "sha256-pVFkO/+a7GAOXbYBfU0zcO/uD26PX+y02bEZa3f1ZP8="; }; nativeBuildInputs = [ @@ -40,8 +41,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://showmethekey.alynx.one/"; description = "Show keys you typed on screen"; + homepage = "https://showmethekey.alynx.one/"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ ocfox ]; diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 6718caf1ada23..6b7951c14c374 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -7,20 +7,30 @@ , mesa , pango , udev +, shaderc +, libglvnd +, vulkan-loader +, autoPatchelfHook }: rustPlatform.buildRustPackage rec { pname = "jay"; - version = "unstable-2022-11-20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; - rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2"; - sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw="; + rev = "v${version}"; + sha256 = "sha256-9fWwVUqeYADt33HGaJRRFmM20WM7qRWbNGpt3rk9xQM="; }; - cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; + cargoSha256 = "sha256-oPGY/rVx94BkWgKkwwyDjfASMyGGU32R5IZuNjOv+EM="; + + SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + + nativeBuildInputs = [ + autoPatchelfHook + ]; buildInputs = [ libGL @@ -29,9 +39,18 @@ rustPlatform.buildRustPackage rec { pango udev libinput + shaderc + ]; + + runtimeDependencies = [ + libglvnd + vulkan-loader ]; - RUSTC_BOOTSTRAP = 1; + postInstall = '' + install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal + install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf + ''; meta = with lib; { description = "A Wayland compositor written in Rust"; diff --git a/pkgs/by-name/ax/ax25ms/package.nix b/pkgs/by-name/ax/ax25ms/package.nix new file mode 100644 index 0000000000000..94a5ca9ce6f83 --- /dev/null +++ b/pkgs/by-name/ax/ax25ms/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, protobuf +, pkg-config +, grpc +, libtool +, which +, automake +, libax25 +}: + +stdenv.mkDerivation { + pname = "ax25ms"; + version = "0-unstable-2024-04-28"; + + src = fetchFromGitHub { + owner = "ThomasHabets"; + repo = "ax25ms"; + rev = "c7d7213bb182e4b60f655c3f9f1bcb2b2440406b"; + hash = "sha256-GljGJa44topJ6T0g5wuU8GTHLKzNmQqUl8/AR+pw2+I="; + }; + + buildInputs = [ + protobuf + grpc + libax25 + ]; + + nativeBuildInputs = [ + which + pkg-config + autoconf + libtool + automake + ]; + + preConfigure = '' + patchShebangs scripts + ./bootstrap.sh + ''; + + postInstall = '' + set +e + for binary_path in "$out/bin"/*; do + filename=$(basename "$binary_path") + mv "$binary_path" "$out/bin/ax25ms-$filename" + done + set -e + ''; + + meta = with lib; { + description = "Set of AX.25 microservices, designed to be pluggable for any implementation"; + homepage = "https://github.com/ThomasHabets/ax25ms"; + license = licenses.asl20; + maintainers = with maintainers; [ + matthewcroughan + sarcasticadmin + pkharvey + ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/br/broom/package.nix b/pkgs/by-name/br/broom/package.nix new file mode 100644 index 0000000000000..69aa9ae684225 --- /dev/null +++ b/pkgs/by-name/br/broom/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "broom"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "a-camarillo"; + repo = "broom"; + rev = "v${version}"; + hash = "sha256-a2hUgYpiKm/dZWLRuCZKuGStmZ/7jDtLRAjd/B57Vxw="; + }; + + vendorHash = "sha256-zNklqGjMt89b+JOZfKjTO6c75SXO10e7YtQOqqQZpnA="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "An interactive CLI tool for managing local git branches"; + homepage = "https://github.com/a-camarillo/broom"; + license = licenses.mit; + maintainers = with maintainers; [ a-camarillo ]; + mainProgram = "broom"; + }; +} diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 86ca8145d12da..08f4b2401fee7 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "0.1.41"; + version = "1.41.1"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-wTypjqd2PpmDSA8vScMLkAL44xE/WAccm747PS9ClVA="; + hash = "sha256-y/XIcFm1TWVd5SL+kDCJc21CtMwipMQgRE4gPra5+98="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clatd/package.nix b/pkgs/by-name/cl/clatd/package.nix index dff8ce4261a93..f18ab3b036cea 100644 --- a/pkgs/by-name/cl/clatd/package.nix +++ b/pkgs/by-name/cl/clatd/package.nix @@ -7,6 +7,7 @@ , tayga , iproute2 , iptables +, nixosTests }: stdenv.mkDerivation rec { @@ -52,6 +53,8 @@ stdenv.mkDerivation rec { } ''; + passthru.tests.clatd = nixosTests.clatd; + meta = with lib; { description = "A 464XLAT CLAT implementation for Linux"; homepage = "https://github.com/toreanderson/clatd"; diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index cfebb97f03ade..1be70bd225c97 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "0.27.2"; + version = "0.28.2"; executables = "dotnet-csharpier"; - nugetSha256 = "sha256-P4v4h09FuisIry9B/6batrG0CpLqnrkxnlk1yEd1JbY="; + nugetSha256 = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18="; meta = with lib; { description = "An opinionated code formatter for C#"; diff --git a/pkgs/by-name/dp/dps8m/package.nix b/pkgs/by-name/dp/dps8m/package.nix new file mode 100644 index 0000000000000..939bb17c85063 --- /dev/null +++ b/pkgs/by-name/dp/dps8m/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitLab +, libuv +, coreutils-full +, pkg-config +, gnugrep +, gnused +}: + +stdenv.mkDerivation rec { + pname = "dps8m"; + version = "3.0.1"; + + src = fetchFromGitLab { + owner = "dps8m"; + repo = "dps8m"; + rev = "R${version}"; + hash = "sha256-YCDeHryxXZXOXqUXkbWwH7Vna+ljzydFXPeo2et87x8="; + fetchSubmodules = true; + }; + + env = { + ENV = "${coreutils-full}/bin/env"; + GREP = "${gnugrep}/bin/grep"; + SED = "${gnused}/bin/sed"; + PREFIX = placeholder "out"; + }; + + nativeBuildInputs = [ + coreutils-full + pkg-config + ]; + + buildInputs = [ + libuv + ]; + + meta = with lib; { + description = "DPS8M: GE / Honeywell / Bull DPS‑8/M mainframe simulator"; + homepage = "https://gitlab.com/dps8m/dps8m"; + license = licenses.icu; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin ]; + mainProgram = "dps8m"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 04ee8268ab0a4..93fea61bfbc33 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-HTTbIS+GBEuhYuKSI5jlhoX6hl6BsXp77h8JSQZyknI="; + hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww="; }; vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 0cd7af6cb2217..f76c765987425 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -5,22 +5,21 @@ }: buildGo122Module rec { pname = "gptscript"; - version = "0.1.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "gptscript-ai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zG75L10WvfkmjwW3ifBHaTkHNXqXvNO0PaXejCc2tls="; + hash = "sha256-teZQhGYKJ5Ma5by3Wug5B1hAV1tox94MF586ZeEXp6o="; }; - vendorHash = "sha256-LV9uLLwdtLJTIxaBB1Jew92S0QjQsceyLEfSrDeDnR4="; + vendorHash = "sha256-0irUcEomQzo9+vFJEk28apLNuJdsX1RHEqB7T88X7Ks="; ldflags = [ "-s" "-w" - "-X main.Version=${version}" - "-X main.Commit=${version}" + "-X github.com/gptscript-ai/gptscript/pkg/version.Tag=v${version}" ]; # Requires network access @@ -30,8 +29,8 @@ buildGo122Module rec { homepage = "https://gptscript.ai"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}"; description = "Natural Language Programming"; - license = with licenses; [asl20]; - maintainers = with maintainers; [jamiemagee]; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; } diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 9d5e94fa25543..98abe2a65b210 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.125.4"; + version = "0.125.5"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-oeOP9UoiAGwYR2Vzr5IZrLfYA3EQJ9j6Bzh7C12pA+c="; + hash = "sha256-vvADd4S4AURkIODGvDf4J9omZjKcZeQKQ6ZSKDu1gog="; }; vendorHash = "sha256-L8+e6rZvFaNV9gyWJtXv9NnzoigVDSyNKTuxGrRwb44="; diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix new file mode 100644 index 0000000000000..1001ed711ad8e --- /dev/null +++ b/pkgs/by-name/ji/jikken/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + openssl, + stdenv, + darwin, +}: +rustPlatform.buildRustPackage rec { + pname = "jikken"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "jikkenio"; + repo = "jikken"; + rev = "v${version}"; + hash = "sha256-A6+sezhob7GqAzuJsJGH7ZDLTJhCD+f0t3zx/IMdPsI="; + }; + + cargoHash = "sha256-FxsI2ku52MlSGUph3/ovmn6HIwW+cUwVXuwzcd/1DV4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A powerful, source control friendly REST API testing toolkit"; + homepage = "https://jikken.io/"; + changelog = "https://github.com/jikkenio/jikken/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ vinnymeller ]; + mainProgram = "jk"; + }; +} diff --git a/pkgs/by-name/jt/jtdx/package.nix b/pkgs/by-name/jt/jtdx/package.nix new file mode 100644 index 0000000000000..a058c52c15446 --- /dev/null +++ b/pkgs/by-name/jt/jtdx/package.nix @@ -0,0 +1,16 @@ +{ wsjtx, fetchgit, qt5, lib }: +wsjtx.overrideAttrs (old: { + name = "jtdx"; + version = "unstable-2022-03-01"; + src = fetchgit { + url = "https://github.com/jtdx-project/jtdx.git"; + rev = "2a0e2bea8c66c9ca94d2ea8034cf83a68cfa40eb"; + hash = "sha256-5KlFBlzG3hKFFGO37c+VN+FvZKSnTQXvSorB+Grns8w="; + }; + buildInputs = old.buildInputs ++ [ qt5.qtwebsockets ]; + meta = { + description = "wsjtx fork with some extra features"; + maintainers = with lib.maintainers; [ matthewcroughan sarcasticadmin pkharvey ]; + homepage = "https://github.com/jtdx-project/jtdx"; + }; +}) diff --git a/pkgs/by-name/kc/kcl-cli/package.nix b/pkgs/by-name/kc/kcl-cli/package.nix index 5a8dfc9e4d02b..ea0b5536b5289 100644 --- a/pkgs/by-name/kc/kcl-cli/package.nix +++ b/pkgs/by-name/kc/kcl-cli/package.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "kcl-cli"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-A98Y5ktXFwn1XrFTwL8l04VW5zPNcMLtZCUf+niXx6c="; + hash = "sha256-OKRMgxynKmHnO+5tcKlispFkpQehHINzB6qphH+lwHQ="; }; - vendorHash = "sha256-zFTcwyK5HT1cwfHJB3n5Eh2JE3xuXqAluU3McA+FurQ="; + vendorHash = "sha256-dF0n1/SmQVd2BUVOPmvZWWUJYTn2mMnbgZC92luSY2s="; ldflags = [ "-X=kcl-lang.io/cli/pkg/version.version=${version}" ]; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/by-name/me/meli/package.nix index 3dc373a09024f..a4ff654ad892c 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchzip , rustPlatform # native build inputs @@ -24,9 +24,12 @@ rustPlatform.buildRustPackage rec { pname = "meli"; version = "0.8.4"; - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; + src = fetchzip { + urls = [ + "https://git.meli-email.org/meli/meli/archive/v${version}.tar.gz" + "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" + "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" + ]; hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; }; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 20dd5165d26e5..ed00000634587 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , writeShellScript , dash @@ -39,22 +38,15 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.24"; + version = "0.24.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-t63POjywZLk5ulppuCedFhhEhOsnB90vy3k/HhM3MGc="; + hash = "sha256-Ai82d1VwtAlKmM8N/hazMWsn5F6HS4I1do3VkpLPlBo="; }; - patches = [ - (fetchpatch { - url = "https://github.com/movim/movim/commit/4dd2842f4617f3baaa166157892a532ad07df80d.patch"; - hash = "sha256-32MLS5g60Rhm8HQDBPnUo9k+aB7L8dNMcnSjPIlooks="; - }) - ]; - php = php.buildEnv ({ extensions = ({ all, enabled }: enabled @@ -75,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-SinS5ocf4kLMBR2HF3tcdmEomw9ICUqTg2IXPJFoujU="; + vendorHash = "sha256-1sQm+eRrs9m52CepPXahsOJhyLZ68+FIDNHyY33IoD4="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/nx/nxengine-evo/assets.nix b/pkgs/by-name/nx/nxengine-evo/assets.nix new file mode 100644 index 0000000000000..96c2e5f1e70b4 --- /dev/null +++ b/pkgs/by-name/nx/nxengine-evo/assets.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nxengine-assets"; + version = "2.6.5-1"; + + src = fetchzip { + url = "https://github.com/nxengine/nxengine-evo/releases/download/v${finalAttrs.version}/NXEngine-Evo-v${finalAttrs.version}-Win64.zip"; + hash = "sha256-+PjjhJYL1yk67QJ7ixfpCRg1coQnSPpXDUIwsqp9aIM="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nxengine/ + cp -r data/ $out/share/nxengine/data + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/nxengine/nxengine-evo"; + description = "Assets for nxengine-evo"; + license = with lib.licenses; [ + unfreeRedistributable + ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/nx/nxengine-evo/package.nix b/pkgs/by-name/nx/nxengine-evo/package.nix new file mode 100644 index 0000000000000..4503c0ec9b2c7 --- /dev/null +++ b/pkgs/by-name/nx/nxengine-evo/package.nix @@ -0,0 +1,92 @@ +{ + lib, + SDL2, + SDL2_mixer, + callPackage, + cmake, + pkg-config, + ninja, + fetchFromGitHub, + fetchpatch, + fetchurl, + libpng, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nxengine-evo"; + version = "2.6.4"; + + src = fetchFromGitHub { + owner = "nxengine"; + repo = "nxengine-evo"; + rev = "v${finalAttrs.version}"; + hash = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A="; + }; + + patches = [ + # Fix building by adding SDL_MIXER to include path + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; + hash = "sha256-wlsIdN2RugOo94V3qj/AzYgrs2kf0i1Iw5zNOP8WQqI="; + }) + # Fix buffer overflow + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; + hash = "sha256-fZVaZAOHgFoNakOR2MfsvRJjuLhbx+5id/bcN8w/WWo="; + }) + # Add missing include + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/0076ebb11bcfec5dc5e2e923a50425f1a33a4133.patch"; + hash = "sha256-8j3fFFw8DMljV7aAFXE+eA+vkbz1HdFTMAJmk3BRU04="; + }) + ]; + + nativeBuildInputs = [ + SDL2 + cmake + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_mixer + libpng + ]; + + strictDeps = true; + + # Allow finding game assets. + postPatch = '' + sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp + ''; + + installPhase = '' + runHook preInstall + + cd .. + mkdir -p $out/bin/ $out/share/nxengine/ + install bin/* $out/bin/ + '' + '' + cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data + chmod -R a=r,a+X $out/share/nxengine/data + '' + '' + runHook postInstall + ''; + + passthru = { + assets = callPackage ./assets.nix { }; + }; + + meta = { + homepage = "https://github.com/nxengine/nxengine-evo"; + description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; + license = with lib.licenses; [ + gpl3Plus + ]; + mainProgram = "nx"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index cb8c0e3bdeec4..3a2c20f95bb43 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-JlmiHnST/UnN4WsiDqSva+01odoc5h/J/mlGN3K0OfI="; + hash = "sha256-hrqjnZmcGUgFWn8Z85oJEbeUBaF2SccytMr1AG0GGos="; }; - cargoHash = "sha256-zdq036ag7+mvWg4OJHtbltPlF9j49dCPNJjgVQcQ+u4="; + cargoHash = "sha256-sFofS+POvJwGo/+tiF6dawKgQci/54tUKkQQalqT+K0="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 4b95a1841e476..9bcfe9b0ec4f5 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -13,6 +13,7 @@ let pythonEnv = python3.withPackages(ps: with ps; [ + apprise babelfish cffi chardet @@ -47,14 +48,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.2.3"; + version = "4.3.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-DM+sgrb7Zvtvp0th8GlOloSBcD8mG1RYyM91+uvCOgU="; + sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/td/tdnf/package.nix b/pkgs/by-name/td/tdnf/package.nix new file mode 100644 index 0000000000000..e6c339d1e1d2a --- /dev/null +++ b/pkgs/by-name/td/tdnf/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, gpgme +, libsolv +, libxml2 +, pkg-config +, python3 +, rpm +, sqlite +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tdnf"; + version = "3.5.6"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = "tdnf"; + rev = "v${finalAttrs.version}"; + hash = "sha256-gj0IW0EwWBXi2s7xFdghop8f1lMhkUJVAkns5nnl7sg="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + curl.dev + gpgme.dev + libsolv + libxml2.dev + sqlite.dev + ]; + + propagatedBuildInputs = [ + rpm + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=$out" + "-DCMAKE_INSTALL_FULL_SYSCONDIR=$out/etc" + "-DCMAKE_INSTALL_SYSCONFDIR=$out/etc" + "-DSYSTEMD_DIR=$out/lib/systemd/system" + ]; + + # error: format not a string literal and no format arguments [-Werror=format-security] + hardeningDisable = [ "format" ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'SYSCONFDIR /etc' 'SYSCONFDIR $out/etc' \ + --replace-fail '/etc/motdgen.d' '$out/etc/motdgen.d' + substituteInPlace client/tdnf.pc.in \ + --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' + substituteInPlace tools/cli/lib/tdnf-cli-libs.pc.in \ + --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' + ''; + + # remove binaries used for testing from the final output + postInstall = "rm $out/bin/*test"; + + meta = { + description = "Tiny Dandified Yum"; + homepage = "https://github.com/vmware/tdnf"; + changelog = "https://github.com/vmware/tdnf/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = [ lib.maintainers.malt3 ]; + mainProgram = "tdnf"; + # rpm only supports linux + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 9d42baf5a617f..b561b67c1088d 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3681,7 +3681,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.5" +version = "0.11.6" dependencies = [ "insta", "lsp-server", @@ -3778,7 +3778,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.5" +version = "0.11.6" dependencies = [ "anyhow", "async-trait", @@ -3829,7 +3829,7 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.5" +version = "0.11.6" dependencies = [ "anyhow", "comemo 0.4.0", @@ -3867,7 +3867,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.5" +version = "0.11.6" dependencies = [ "base64 0.22.0", "log", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index cc0d0c6451f2b..da21891455818 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "v${version}"; - hash = "sha256-VwyuK0Ct0ifx1R5tqeucqQNrkzqzhgxPqYeuETr8SkY="; + hash = "sha256-7YG15kt+pIxAK22QYiTApu5lBV6Afe3Jss6L5dTGsGI="; }; cargoLock = { diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix new file mode 100644 index 0000000000000..2129850159bd3 --- /dev/null +++ b/pkgs/by-name/tr/trak/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "trak"; + version = "0.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lcfd"; + repo = "trak"; + rev = "v${version}"; + hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8="; + }; + + sourceRoot = "${src.name}/cli"; + + dependencies = with python3Packages; [ + questionary + typer + ] ++ typer.optional-dependencies.all; + + build-system = [ python3Packages.poetry-core ]; + + meta = { + description = "Keep a record of the time you dedicate to your projects"; + homepage = "https://github.com/lcfd/trak"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ buurro ]; + mainProgram = "trak"; + }; +} diff --git a/pkgs/by-name/uc/ucblogo/package.nix b/pkgs/by-name/uc/ucblogo/package.nix new file mode 100644 index 0000000000000..40ccdecf6c68f --- /dev/null +++ b/pkgs/by-name/uc/ucblogo/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, wxGTK32 +, texinfo +, tetex +, wrapGAppsHook +, autoconf-archive +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ucblogo-code"; + version = "6.2.4"; + + src = fetchFromGitHub { + owner = "jrincayc"; + repo = "ucblogo-code"; + rev = "ca23b30a62eaaf03ea203ae71d00dc45a046514e"; + hash = "sha256-BVNKkT0YUqI/z5W6Y/u3WbrHmaw7Z165vFt/mlzjd+8="; + }; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + texinfo + tetex + wrapGAppsHook + ]; + + buildInputs = [ + wxGTK32 + ]; + + meta = with lib; { + description = "Berkeley Logo interpreter"; + homepage = "https://github.com/jrincayc/ucblogo-code"; + changelog = "https://github.com/jrincayc/ucblogo-code/blob/${finalAttrs.src.rev}/changes.txt"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "ucblogo-code"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/xh/xhosts/Cargo.lock b/pkgs/by-name/xh/xhosts/Cargo.lock new file mode 100644 index 0000000000000..3b686a7cac57b --- /dev/null +++ b/pkgs/by-name/xh/xhosts/Cargo.lock @@ -0,0 +1,67 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libnss" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c" +dependencies = [ + "lazy_static", + "libc", + "paste 0.1.18", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "xhosts" +version = "0.1.0" +dependencies = [ + "lazy_static", + "libc", + "libnss", + "paste 1.0.14", +] diff --git a/pkgs/by-name/xh/xhosts/package.nix b/pkgs/by-name/xh/xhosts/package.nix new file mode 100644 index 0000000000000..ba6b5a184d3f7 --- /dev/null +++ b/pkgs/by-name/xh/xhosts/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "nss-xhosts"; + version = "unstable-2023-12-30"; + + src = fetchFromGitHub { + owner = "dvob"; + repo = "nss-xhosts"; + rev = "78658cc24abb2546936f2b298a27d4abdf629186"; + hash = "sha256-saK9CxN4Ek1QBlPOydzEFei1217gPe5MZrUaUHh80hI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + postFixup = "mv $out/lib/*.so $out/lib/libnss_xhosts.so.2"; + + meta = with lib; { + description = "NSS Module which supports wildcards"; + homepage = "https://github.com/dvob/nss-xhosts"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "nss-xhosts"; + }; +} diff --git a/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch b/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch deleted file mode 100644 index c2c9a7ed7be31..0000000000000 --- a/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch +++ /dev/null @@ -1,1165 +0,0 @@ -From c99824dd005062d1df8c6df79a36dc4e368159f3 Mon Sep 17 00:00:00 2001 -From: Raito Bezarius <masterancpp@gmail.com> -Date: Fri, 8 Dec 2023 23:32:20 +0100 -Subject: [PATCH] packaging: ensure consistency of Cargo.lock with Cargo.toml - -2.4.0 failed to generate a consistent Cargo.lock, which made impossible -offline installs of Cairo 2.4.0. ---- - Cargo.lock | 384 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 223 insertions(+), 161 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 17d139184..67c438c18 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,9 +57,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - - [[package]] - name = "anstream" --version = "0.6.4" -+version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" - dependencies = [ - "anstyle", - "anstyle-parse", -@@ -77,30 +77,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - - [[package]] - name = "anstyle-parse" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" - dependencies = [ - "utf8parse", - ] - - [[package]] - name = "anstyle-query" --version = "1.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" - dependencies = [ -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] - name = "anstyle-wincon" --version = "3.0.1" -+version = "3.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" - dependencies = [ - "anstyle", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -395,7 +395,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - - [[package]] - name = "cairo-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -419,7 +419,7 @@ dependencies = [ - - [[package]] - name = "cairo-format" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-formatter", -@@ -432,7 +432,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -452,7 +452,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-compiler" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-defs", -@@ -473,7 +473,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-debug" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-proc-macros", - "cairo-lang-utils", -@@ -484,7 +484,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-defs" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-diagnostics", -@@ -504,7 +504,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-diagnostics" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -518,7 +518,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-eq-solver" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -528,7 +528,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-filesystem" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-utils", -@@ -543,7 +543,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-formatter" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-diagnostics", -@@ -563,7 +563,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -591,7 +591,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-lowering" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -621,7 +621,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-parser" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-diagnostics", - "cairo-lang-filesystem", -@@ -643,7 +643,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-plugins" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -665,7 +665,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-proc-macros" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "quote", -@@ -674,7 +674,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-project" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", -@@ -687,7 +687,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "ark-ff", - "ark-secp256k1", -@@ -714,7 +714,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-semantic" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -742,7 +742,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "bimap", -@@ -772,7 +772,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-ap-change" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -785,7 +785,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-gas" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -803,7 +803,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-generator" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -833,7 +833,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-to-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -856,7 +856,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-type-size" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-sierra", - "cairo-lang-utils", -@@ -864,7 +864,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-starknet" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -905,7 +905,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -922,7 +922,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax-codegen" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "genco", -@@ -932,7 +932,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-plugin" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -957,7 +957,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -978,7 +978,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "colored", -@@ -990,7 +990,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "indexmap 2.1.0", -@@ -1009,7 +1009,7 @@ dependencies = [ - - [[package]] - name = "cairo-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-language-server", - "cairo-lang-utils", -@@ -1019,7 +1019,7 @@ dependencies = [ - - [[package]] - name = "cairo-run" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1032,7 +1032,7 @@ dependencies = [ - - [[package]] - name = "cairo-test" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1051,7 +1051,7 @@ dependencies = [ - "bitvec", - "cairo-felt", - "generic-array", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "hex", - "keccak", - "lazy_static", -@@ -1081,9 +1081,9 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.84" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" -+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" - dependencies = [ - "libc", - ] -@@ -1096,9 +1096,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clap" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" - dependencies = [ - "clap_builder", - "clap_derive", -@@ -1106,9 +1106,9 @@ dependencies = [ - - [[package]] - name = "clap_builder" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" - dependencies = [ - "anstream", - "anstyle", -@@ -1249,9 +1249,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - - [[package]] - name = "crypto-bigint" --version = "0.5.3" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" -+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" - dependencies = [ - "generic-array", - "subtle", -@@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" - dependencies = [ - "cfg-if", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -@@ -1283,9 +1283,9 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.9" -+version = "0.3.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" - dependencies = [ - "powerfmt", - ] -@@ -1396,12 +1396,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - - [[package]] - name = "errno" --version = "0.3.6" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" -+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" - dependencies = [ - "libc", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -1418,9 +1418,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "form_urlencoded" --version = "1.2.0" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" - dependencies = [ - "percent-encoding", - ] -@@ -1550,7 +1550,7 @@ dependencies = [ - - [[package]] - name = "generate-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-syntax-codegen", - "cairo-lang-utils", -@@ -1582,9 +1582,9 @@ dependencies = [ - - [[package]] - name = "gimli" --version = "0.28.0" -+version = "0.28.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - - [[package]] - name = "glob" -@@ -1594,15 +1594,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - - [[package]] - name = "globset" --version = "0.4.13" -+version = "0.4.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" - dependencies = [ - "aho-corasick", - "bstr", -- "fnv", - "log", -- "regex", -+ "regex-automata", -+ "regex-syntax 0.8.2", - ] - - [[package]] -@@ -1635,9 +1635,9 @@ dependencies = [ - - [[package]] - name = "hashbrown" --version = "0.14.2" -+version = "0.14.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - dependencies = [ - "ahash 0.8.6", - "allocator-api2", -@@ -1700,9 +1700,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - - [[package]] - name = "idna" --version = "0.4.0" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" - dependencies = [ - "unicode-bidi", - "unicode-normalization", -@@ -1710,17 +1710,16 @@ dependencies = [ - - [[package]] - name = "ignore" --version = "0.4.20" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" - dependencies = [ -+ "crossbeam-deque", - "globset", -- "lazy_static", - "log", - "memchr", -- "regex", -+ "regex-automata", - "same-file", -- "thread_local", - "walkdir", - "winapi-util", - ] -@@ -1760,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" - dependencies = [ - "equivalent", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "serde", - ] - -@@ -1829,9 +1828,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - - [[package]] - name = "js-sys" --version = "0.3.65" -+version = "0.3.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" - dependencies = [ - "wasm-bindgen", - ] -@@ -1915,9 +1914,9 @@ dependencies = [ - - [[package]] - name = "linux-raw-sys" --version = "0.4.11" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" -+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - - [[package]] - name = "lock_api" -@@ -2017,9 +2016,9 @@ dependencies = [ - - [[package]] - name = "mio" --version = "0.8.9" -+version = "0.8.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" - dependencies = [ - "libc", - "wasi", -@@ -2179,9 +2178,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.18.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - - [[package]] - name = "oorandom" -@@ -2197,9 +2196,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - - [[package]] - name = "parity-scale-codec" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" -+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" - dependencies = [ - "arrayvec", - "bitvec", -@@ -2210,9 +2209,9 @@ dependencies = [ - - [[package]] - name = "parity-scale-codec-derive" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" -+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -2282,9 +2281,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - - [[package]] - name = "percent-encoding" --version = "2.3.0" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] - name = "petgraph" -@@ -2345,9 +2344,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "portable-atomic" --version = "1.5.1" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - - [[package]] - name = "powerfmt" -@@ -2379,12 +2378,11 @@ dependencies = [ - - [[package]] - name = "proc-macro-crate" --version = "1.3.1" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" - dependencies = [ -- "once_cell", -- "toml_edit 0.19.15", -+ "toml_edit 0.20.7", - ] - - [[package]] -@@ -2413,9 +2411,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.69" -+version = "1.0.70" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" - dependencies = [ - "unicode-ident", - ] -@@ -2623,15 +2621,15 @@ dependencies = [ - - [[package]] - name = "rustix" --version = "0.38.21" -+version = "0.38.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -+checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" - dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -2739,18 +2737,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -@@ -2822,7 +2820,7 @@ dependencies = [ - - [[package]] - name = "sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -2901,7 +2899,7 @@ dependencies = [ - - [[package]] - name = "starknet-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -2992,7 +2990,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -3005,7 +3003,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-extract-code" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3015,7 +3013,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-upgrade-validate" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3093,30 +3091,29 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.3.0" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" - dependencies = [ - "winapi-util", - ] - - [[package]] - name = "test-case" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" - dependencies = [ - "test-case-macros", - ] - - [[package]] - name = "test-case-core" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" - dependencies = [ - "cfg-if", -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3124,11 +3121,10 @@ dependencies = [ - - [[package]] - name = "test-case-macros" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" - dependencies = [ -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3137,9 +3133,19 @@ dependencies = [ - - [[package]] - name = "test-log" --version = "0.2.13" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" -+checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" -+dependencies = [ -+ "env_logger", -+ "test-log-macros", -+] -+ -+[[package]] -+name = "test-log-macros" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" - dependencies = [ - "proc-macro2", - "quote", -@@ -3148,7 +3154,7 @@ dependencies = [ - - [[package]] - name = "tests" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -3220,16 +3226,6 @@ dependencies = [ - "thiserror-impl-no-std", - ] - --[[package]] --name = "thread_local" --version = "1.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" --dependencies = [ -- "cfg-if", -- "once_cell", --] -- - [[package]] - name = "time" - version = "0.3.30" -@@ -3352,9 +3348,9 @@ dependencies = [ - - [[package]] - name = "toml_edit" --version = "0.19.15" -+version = "0.20.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" - dependencies = [ - "indexmap 2.1.0", - "toml_datetime", -@@ -3473,18 +3469,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - - [[package]] - name = "unescaper" --version = "0.1.2" -+version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" -+checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" - dependencies = [ - "thiserror", - ] - - [[package]] - name = "unicode-bidi" --version = "0.3.13" -+version = "0.3.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - - [[package]] - name = "unicode-ident" -@@ -3521,9 +3517,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - - [[package]] - name = "url" --version = "2.4.1" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" - dependencies = [ - "form_urlencoded", - "idna", -@@ -3561,9 +3557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" - dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -@@ -3571,9 +3567,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" - dependencies = [ - "bumpalo", - "log", -@@ -3586,9 +3582,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -3596,9 +3592,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" - dependencies = [ - "proc-macro2", - "quote", -@@ -3609,9 +3605,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" -+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - - [[package]] - name = "winapi" -@@ -3662,6 +3658,15 @@ dependencies = [ - "windows-targets 0.48.5", - ] - -+[[package]] -+name = "windows-sys" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -+dependencies = [ -+ "windows-targets 0.52.0", -+] -+ - [[package]] - name = "windows-targets" - version = "0.42.2" -@@ -3692,6 +3697,21 @@ dependencies = [ - "windows_x86_64_msvc 0.48.5", - ] - -+[[package]] -+name = "windows-targets" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.52.0", -+ "windows_aarch64_msvc 0.52.0", -+ "windows_i686_gnu 0.52.0", -+ "windows_i686_msvc 0.52.0", -+ "windows_x86_64_gnu 0.52.0", -+ "windows_x86_64_gnullvm 0.52.0", -+ "windows_x86_64_msvc 0.52.0", -+] -+ - [[package]] - name = "windows_aarch64_gnullvm" - version = "0.42.2" -@@ -3704,6 +3724,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" -+ - [[package]] - name = "windows_aarch64_msvc" - version = "0.42.2" -@@ -3716,6 +3742,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" -+ - [[package]] - name = "windows_i686_gnu" - version = "0.42.2" -@@ -3728,6 +3760,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -+[[package]] -+name = "windows_i686_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" -+ - [[package]] - name = "windows_i686_msvc" - version = "0.42.2" -@@ -3740,6 +3778,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -+[[package]] -+name = "windows_i686_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" -+ - [[package]] - name = "windows_x86_64_gnu" - version = "0.42.2" -@@ -3752,6 +3796,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" -+ - [[package]] - name = "windows_x86_64_gnullvm" - version = "0.42.2" -@@ -3764,6 +3814,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" -+ - [[package]] - name = "windows_x86_64_msvc" - version = "0.42.2" -@@ -3776,11 +3832,17 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -+ - [[package]] - name = "winnow" --version = "0.5.19" -+version = "0.5.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" -+checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" - dependencies = [ - "memchr", - ] -@@ -3817,18 +3879,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - - [[package]] - name = "zerocopy" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" -+checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" - dependencies = [ - "zerocopy-derive", - ] - - [[package]] - name = "zerocopy-derive" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" -+checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" - dependencies = [ - "proc-macro2", - "quote", -@@ -3837,9 +3899,9 @@ dependencies = [ - - [[package]] - name = "zeroize" --version = "1.6.0" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" -+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - dependencies = [ - "zeroize_derive", - ] --- -2.42.0 - diff --git a/pkgs/development/compilers/dotnet/record-downloaded-packages.patch b/pkgs/development/compilers/dotnet/record-downloaded-packages.patch deleted file mode 100644 index 4c5b45939d763..0000000000000 --- a/pkgs/development/compilers/dotnet/record-downloaded-packages.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001 -From: David McFarland <corngood@gmail.com> -Date: Sun, 31 Dec 2023 01:48:31 -0400 -Subject: [PATCH 2/2] record downloaded packages - ---- - .../buildBootstrapPreviouslySB.csproj | 6 +++++ - repo-projects/Directory.Build.targets | 27 +++++++++++++++++++ - 2 files changed, 33 insertions(+) - -diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -index d85e32ca76..280c9eaf89 100644 ---- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj -+++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -@@ -102,6 +102,12 @@ - </ItemGroup> - </Target> - -+ <Target Name="NuGetToNix" AfterTargets="Restore"> -+ <Exec -+ Command="nuget-to-nix $(RestorePackagesPath) >$(ArchiveDir)deps.nix 2>&1" -+ WorkingDirectory="$(MSBuildProjectDirectory)"/> -+ </Target> -+ - <Target Name="BuildBoostrapPreviouslySourceBuilt" - AfterTargets="Restore" - DependsOnTargets="GetPackagesToDownload"> -diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets -index 3fa15da862..afd7b87088 100644 ---- a/repo-projects/Directory.Build.targets -+++ b/repo-projects/Directory.Build.targets -@@ -471,6 +497,7 @@ - <ItemGroup> - <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" /> - <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" /> -+ <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/deps.nix" /> - <ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" /> - </ItemGroup> - <MakeDir Directories="$(BuildLogsDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/> --- -2.40.1 - diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch deleted file mode 100644 index 9edf6efa85176..0000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index d8fd91f1fe..8bc08e6fed 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if semver.Compare(index.goVersionV, "v1.14") < 0 { -+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch b/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch deleted file mode 100644 index 3b507bf26d775..0000000000000 --- a/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 20 Sep 2022 18:42:31 +0800 -Subject: [PATCH 1/2] skip building doc - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 94df626014..418f6ff268 100644 ---- a/Makefile -+++ b/Makefile -@@ -229,7 +229,7 @@ define stringreplace - endef - - --install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html -+install: $(build_depsbindir)/stringreplace - ifeq ($(BUNDLE_DEBUG_LIBS),1) - @$(MAKE) $(QUIET_MAKE) all - else --- -2.38.1 - diff --git a/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch b/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch deleted file mode 100644 index 93504316edf30..0000000000000 --- a/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 37ec73468570..b73e75aa6e59 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - #endif - - SmallString<1024> Plugin; -- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + -- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + -+ llvm::sys::path::native(Twine("@libllvmLibdir@" -+ "/LLVMgold") + - Suffix, - Plugin); - CmdArgs.push_back(Args.MakeArgString(Plugin)); diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch b/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch deleted file mode 100644 index 890230cc14ee9..0000000000000 --- a/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch -https://reviews.llvm.org/D102059 ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> - #include <linux/lp.h> -@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch b/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch deleted file mode 100644 index 787f3e16500e2..0000000000000 --- a/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4138acf..41b4763 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) - " is also set to ON.") - endif() - add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) -+ add_definitions(-D_LIBCPP_HAS_NO_THREADS) - endif() - - if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch b/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch deleted file mode 100644 index cd344f0cbd193..0000000000000 --- a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aed233638604b46c9a0c51e08d096d47303375ca Mon Sep 17 00:00:00 2001 -From: Douglas Katzman <dougk@google.com> -Date: Tue, 2 Jan 2024 09:20:48 -0500 -Subject: [PATCH] Fix multiple def error - -reported by Hraban Luyat ---- - src/runtime/gc-common.c | 1 + - src/runtime/gc.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c -index 51963b8ff..07536f628 100644 ---- a/src/runtime/gc-common.c -+++ b/src/runtime/gc-common.c -@@ -2999,6 +2999,7 @@ void recompute_gen_bytes_allocated() { - #endif - - #ifdef LISP_FEATURE_DARWIN_JIT -+_Atomic(char) *page_execp; - #include "sys_mmap.inc" - #include <errno.h> - /* darwin-jit has another reason to remap besides just zeroing, namely, -diff --git a/src/runtime/gc.h b/src/runtime/gc.h -index 804e6fce2..5fdc215c2 100644 ---- a/src/runtime/gc.h -+++ b/src/runtime/gc.h -@@ -151,7 +151,7 @@ extern void prepare_pages(bool commit, page_index_t start, page_index_t end, - * squeeze a bit into the 'type' field of the page table, but it's clearer to - * have this externally so that page type 0 remains as "free" */ - #ifdef LISP_FEATURE_DARWIN_JIT --_Atomic(char) *page_execp; -+extern _Atomic(char) *page_execp; - static inline void set_page_executable(page_index_t i, bool val) { page_execp[i] = val; } - #endif - --- -2.42.0 - diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch b/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37c81..0000000000000 --- a/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev <paveloom@riseup.net> -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 6179bdac6d10f..62fdba7ba66aa 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.20.3"; + version = "0.21.0"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-QVyHDeT5gh+e3jOx9PjubIVq1xQ9eA7CxbP91X/xxT8="; + hash = "sha256-hxXDovJAmuh15jFaxY9aESoTVVJ3u2twsX31U3txans="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libdovi/Cargo.lock b/pkgs/development/libraries/libdovi/Cargo.lock index 417a92d2d1663..13d06de98ed40 100644 --- a/pkgs/development/libraries/libdovi/Cargo.lock +++ b/pkgs/development/libraries/libdovi/Cargo.lock @@ -3,45 +3,43 @@ 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 = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "anyhow" -version = "1.0.70" +name = "anstyle" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] -name = "atty" -version = "0.2.14" +name = "anyhow" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[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.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "bitstream-io" -version = "1.6.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" [[package]] name = "bitvec" @@ -57,18 +55,18 @@ dependencies = [ [[package]] name = "bitvec_helpers" -version = "3.1.2" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a" +checksum = "c810ea0801e8aabb86ded7f207b0d5a7f23c804cd1b7719aba2b4970899c099a" dependencies = [ "bitstream-io", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cast" @@ -84,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -95,15 +93,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -111,55 +109,59 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "bitflags", - "clap_lex", - "indexmap", - "textwrap", + "clap_builder", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "os_str_bytes", + "anstyle", + "clap_lex", ] [[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -182,51 +184,39 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "dolby_vision" -version = "3.1.2" +version = "3.3.0" dependencies = [ "anyhow", "bitvec", @@ -241,9 +231,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "funty" @@ -253,42 +249,45 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ - "libc", + "equivalent", + "hashbrown", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "is-terminal" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "autocfg", - "hashbrown", + "hermit-abi", + "libc", + "windows-sys", ] [[package]] @@ -302,73 +301,51 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] name = "libc" -version = "0.2.141" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "memoffset" -version = "0.8.0" +name = "memchr" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -377,16 +354,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -397,33 +368,33 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -436,9 +407,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rayon" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -446,45 +417,54 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -496,36 +476,30 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] name = "serde" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "indexmap", "itoa", @@ -535,20 +509,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.13" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -562,12 +525,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -579,15 +536,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -595,9 +552,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -605,24 +562,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -630,63 +587,114 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "winapi-util" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-sys", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows-targets" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "winapi", + "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 = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "wyz" @@ -696,9 +704,3 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index c70a217f6fce3..38cf72b2acce2 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -8,12 +8,12 @@ rustPlatform.buildRustPackage rec { pname = "libdovi"; - version = "3.1.2"; + version = "3.3.0"; src = fetchCrate { pname = "dolby_vision"; inherit version; - hash = "sha256-eLmGswgxtmqGc9f8l/9qvwSm+8bi06q+Ryvo7Oyr7s0="; + hash = "sha256-224fX+9klmWVoakU+XM7HrGa4iP4xsBJtn+686cH0qc="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/development/libraries/libmcfp/default.nix b/pkgs/development/libraries/libmcfp/default.nix index 7a76fabaa4336..37d667ffee9a4 100644 --- a/pkgs/development/libraries/libmcfp/default.nix +++ b/pkgs/development/libraries/libmcfp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.2.4"; + version = "1.3.3"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw="; + hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index b021b1d930f03..78dc32fbbf550 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.553"; + version = "1.4.554"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-IrdUGx4b6XRmV6RHODeWukIObwy8XnsxyCKd3rwljJA="; + sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch b/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch deleted file mode 100644 index 0f886a8a63a57..0000000000000 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt -index 3f68e6dd..822de4e5 100644 ---- a/avogadro/qtplugins/templatetool/CMakeLists.txt -+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt -@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool - ) - - # Install the fragments --set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments") -+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments") - - # Look in parallel directory for the molecule fragment repository - if(NOT EXISTS "${_fragments}") diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 3c77719d57af5..5b496bf9c45d0 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.100"; + version = "9.2.101"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-qjEQ+pk/5Zp1HRrT/MlpmExB86JCF4kW3UHn3/anND4="; + hash = "sha256-3JPoO9GpnVEc4UQhhXxpj53PwK5eRsy6Ikt4qw5jGa8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 006f108da390e..5e3ca5a6089ec 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -1,21 +1,22 @@ -{ lib -, aiofiles -, asyncio-mqtt -, awesomeversion -, buildPythonPackage -, click -, fetchFromGitHub -, marshmallow -, poetry-core -, pyserial-asyncio -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + aiofiles, + asyncio-mqtt, + awesomeversion, + buildPythonPackage, + click, + fetchFromGitHub, + marshmallow, + poetry-core, + pyserial-asyncio, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.14"; + version = "0.3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI="; + hash = "sha256-kgfz8VUTtOFN1hPkNJhPdRUKQn01BJn+92Ez6lgVGbc="; }; postPatch = '' @@ -32,11 +33,9 @@ buildPythonPackage rec { --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles asyncio-mqtt awesomeversion @@ -50,16 +49,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "aiomysensors" - ]; + pythonImportsCheck = [ "aiomysensors" ]; meta = with lib; { description = "Library to connect to MySensors gateways"; - mainProgram = "aiomysensors"; homepage = "https://github.com/MartinHjelmare/aiomysensors"; changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "aiomysensors"; }; } diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index a24384e3c51e8..bb6837c3f06f1 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -1,25 +1,29 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, prompt-toolkit -, pythonOlder -, winacl +{ + lib, + buildPythonPackage, + fetchFromGitHub, + prompt-toolkit, + pythonOlder, + setuptools, + winacl, }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.10"; - format = "setuptools"; + version = "0.0.12"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "skelsec"; - repo = pname; + repo = "aiowinreg"; rev = "refs/tags/${version}"; - hash = "sha256-PkrBjH+yeSLpwL9kH242xQKBsjv6a11k2c26qBwR6Fw="; + hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ prompt-toolkit winacl @@ -28,16 +32,14 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ - "aiowinreg" - ]; + pythonImportsCheck = [ "aiowinreg" ]; meta = with lib; { description = "Python module to parse the registry hive"; - mainProgram = "awinreg"; homepage = "https://github.com/skelsec/aiowinreg"; changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "awinreg"; }; } diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 7deff467c306f..b47510fcc4b1b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.100"; + version = "9.2.101"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-HTyxLr1qJYnQLapxZVvM4+qByiZQe3/LsVThyYnHC8k="; + hash = "sha256-btj1bGpS/t1uQxmMiZ+PTBqiIb7eigg1vGTPjzr4/p4="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 99bd3af5cca81..fe6ca55ad91ba 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.100"; + version = "9.2.101"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-HSADeA9zwkr8yP9sZQBNeC48L0rM+2UHNKZzFRRt4pk="; + hash = "sha256-58iijDVs4OqZytHDjhGqYRMSIVGPCWTUNRy74OQZcPw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 06bbc1752fb47..1d7e839665c9a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.95"; + version = "1.34.96"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-QSAGsn7nB+m1GghLAqySsUOvijtWcnWCr+wqds6Tw7Y="; + hash = "sha256-gkpimXGE45wP34h7JCxEodaauH4hVMKzHVDGSvqKT8U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 6b1ad4dc6976f..2042758efd8af 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -1,55 +1,56 @@ -{ lib -, stdenv -, bcrypt -, build -, buildPythonPackage -, cargo -, chroma-hnswlib -, darwin -, fastapi -, fetchFromGitHub -, grpcio -, hypothesis -, importlib-resources -, kubernetes -, mmh3 -, numpy -, onnxruntime -, openssl -, opentelemetry-api -, opentelemetry-exporter-otlp-proto-grpc -, opentelemetry-instrumentation-fastapi -, opentelemetry-sdk -, orjson -, overrides -, pkg-config -, posthog -, protobuf -, pulsar-client -, pydantic -, pypika -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, requests -, rustc -, rustPlatform -, setuptools -, setuptools-scm -, tenacity -, tokenizers -, tqdm -, typer -, typing-extensions -, uvicorn -, zstd +{ + lib, + stdenv, + bcrypt, + build, + buildPythonPackage, + cargo, + chroma-hnswlib, + darwin, + fastapi, + fetchFromGitHub, + grpcio, + hypothesis, + importlib-resources, + kubernetes, + mmh3, + numpy, + onnxruntime, + openssl, + opentelemetry-api, + opentelemetry-exporter-otlp-proto-grpc, + opentelemetry-instrumentation-fastapi, + opentelemetry-sdk, + orjson, + overrides, + pkg-config, + posthog, + protobuf, + pulsar-client, + pydantic, + pypika, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + requests, + rustc, + rustPlatform, + setuptools, + setuptools-scm, + tenacity, + tokenizers, + tqdm, + typer, + typing-extensions, + uvicorn, + zstd, }: buildPythonPackage rec { pname = "chromadb"; - version = "0.4.23"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -58,18 +59,16 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug="; + hash = "sha256-gM+fexjwifF3evR8jZvMbIDz655RFKPUizrsB2q5tbw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M="; + hash = "sha256-zyiFv/gswGupm7Y8BhviklqJzM914v0QyUsRwbGKZ48="; }; - pythonRelaxDeps = [ - "orjson" - ]; + pythonRelaxDeps = [ "orjson" ]; nativeBuildInputs = [ cargo @@ -85,9 +84,7 @@ buildPythonPackage rec { buildInputs = [ openssl zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; propagatedBuildInputs = [ bcrypt @@ -126,9 +123,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "chromadb" - ]; + pythonImportsCheck = [ "chromadb" ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index af832c7b3eba0..c10d32e6b189c 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.100"; + version = "9.2.101"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-jkPXYlV89BsW4lHvpR+1jiFP92QsPPG0BMe1SVoQOfw="; + hash = "sha256-ecYyoFtCIsrlzcraqL8X4cZgqc243E9WXZix/70eksY="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 61b1331ce666e..4457c6586796c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.100"; + version = "9.2.101"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-U6RX+7kkb7+eYLYrE6SdJfYyDnBdGm+P3Xa3EfQv6Fk="; + hash = "sha256-8uvhjxZOgMjE2csOxS+kUPeo/pswovBDOLp5w8d4JSk="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-++4GakniGH6JrRfOZsrSb+JpEKa6q7MXCSe9nIoae2g="; + hash = "sha256-cG9j3cMDwjm2DGvvgJgYfigf5e/61HKWFudgezE2zz8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index f64cbda4885b6..cf8c39c308dd9 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -1,36 +1,35 @@ -{ lib -, async-timeout -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pyserial-asyncio -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pyserial-asyncio-fast, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.6"; - format = "pyproject"; + version = "2.2.7"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0="; + hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout - pyserial-asyncio + pyserial-asyncio-fast ]; nativeCheckInputs = [ @@ -38,9 +37,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "elkm1_lib" - ]; + pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel"; diff --git a/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch b/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch deleted file mode 100644 index 614a41f0a9785..0000000000000 --- a/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py -index db55958..c27b81f 100644 ---- a/eventlet/hubs/hub.py -+++ b/eventlet/hubs/hub.py -@@ -21,7 +21,7 @@ else: - - import eventlet.hubs - from eventlet.hubs import timer --from eventlet.support import greenlets as greenlet, clear_sys_exc_info -+from eventlet.support import greenlets as greenlet - try: - from monotonic import monotonic - except ImportError: -@@ -309,7 +309,6 @@ class BaseHub(object): - cur.parent = self.greenlet - except ValueError: - pass # gets raised if there is a greenlet parent cycle -- clear_sys_exc_info() - return self.greenlet.switch() - - def squelch_exception(self, fileno, exc_info): -@@ -397,13 +396,11 @@ class BaseHub(object): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def squelch_timer_exception(self, timer, exc_info): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def add_timer(self, timer): - scheduled_time = self.clock() + timer.seconds -@@ -478,7 +475,6 @@ class BaseHub(object): - raise - except: - self.squelch_timer_exception(timer, sys.exc_info()) -- clear_sys_exc_info() - - # for debugging: - -diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py -index bad4a87..8438805 100644 ---- a/eventlet/hubs/kqueue.py -+++ b/eventlet/hubs/kqueue.py -@@ -109,4 +109,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py -index 1bbd401..d3f9c6a 100644 ---- a/eventlet/hubs/poll.py -+++ b/eventlet/hubs/poll.py -@@ -113,7 +113,6 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() - - if self.debug_blocking: - self.block_detect_post() -diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py -index 0ead5b8..0386a1e 100644 ---- a/eventlet/hubs/selects.py -+++ b/eventlet/hubs/selects.py -@@ -61,4 +61,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py -index 43bac91..b1c1607 100644 ---- a/eventlet/support/__init__.py -+++ b/eventlet/support/__init__.py -@@ -30,15 +30,6 @@ def get_errno(exc): - return None - - --if sys.version_info[0] < 3 and not greenlets.preserves_excinfo: -- from sys import exc_clear as clear_sys_exc_info --else: -- def clear_sys_exc_info(): -- """No-op In py3k. -- Exception information is not visible outside of except statements. -- sys.exc_clear became obsolete and removed.""" -- pass -- - if sys.version_info[0] < 3: - def bytes_to_str(b, encoding='ascii'): - return b -diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py -index d4e1793..b939328 100644 ---- a/eventlet/support/greenlets.py -+++ b/eventlet/support/greenlets.py -@@ -1,8 +1,4 @@ --import distutils.version -- - import greenlet - getcurrent = greenlet.greenlet.getcurrent - GreenletExit = greenlet.greenlet.GreenletExit --preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) -- >= distutils.version.LooseVersion('0.3.2')) - greenlet = greenlet.greenlet -diff --git a/setup.py b/setup.py -index a8f4684..9b927e0 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ setuptools.setup( - packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']), - install_requires=( - 'dnspython >= 1.15.0', -- 'greenlet >= 0.3', -+ 'greenlet >= 1.0', - 'monotonic >= 1.4;python_version<"3.5"', - 'six >= 1.10.0', - ), -diff --git a/tests/hub_test.py b/tests/hub_test.py -index a531b75..05c0024 100644 ---- a/tests/hub_test.py -+++ b/tests/hub_test.py -@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase): - - class TestExceptionInGreenthread(tests.LimitedTestCase): - -- @skip_unless(greenlets.preserves_excinfo) - def test_exceptionpreservation(self): - # events for controlling execution order - gt1event = eventlet.Event() -diff --git a/tests/test__refcount.py b/tests/test__refcount.py -index 1090a1f..5c1c002 100644 ---- a/tests/test__refcount.py -+++ b/tests/test__refcount.py -@@ -57,7 +57,6 @@ def run_interaction(run_client): - - def run_and_check(run_client): - w = run_interaction(run_client=run_client) -- # clear_sys_exc_info() - gc.collect() - fd = w() - print('run_and_check: weakref fd:', fd) diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix deleted file mode 100644 index 57be00cb91bfc..0000000000000 --- a/pkgs/development/python-modules/fastpair/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, scipy -, pythonOlder -}: - -buildPythonPackage { - pname = "fastpair"; - version = "unstable-2021-05-19"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "carsonfarmer"; - repo = "fastpair"; - rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379"; - hash = "sha256-vSb6o0XvHlzev2+uQKUI66wM39ZNqDsppEc8rlB+H9E="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - propagatedBuildInputs = [ - scipy - ]; - - meta = with lib; { - description = "Data-structure for the dynamic closest-pair problem"; - homepage = "https://github.com/carsonfarmer/fastpair"; - license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; - }; -} diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index d012e32da0f09..c6c83aa64ba60 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -1,18 +1,19 @@ -{ lib -, bitstruct -, buildPythonPackage -, fetchFromGitHub -, jinja2 -, jsonschema -, lark -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + bitstruct, + buildPythonPackage, + fetchFromGitHub, + jinja2, + jsonschema, + lark, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "ldfparser"; - version = "0.24.0"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,14 +22,12 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM="; + hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitstruct jinja2 lark @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "ldfparser" - ]; + pythonImportsCheck = [ "ldfparser" ]; disabledTestPaths = [ # We don't care about benchmarks @@ -50,10 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "LIN Description File parser written in Python"; - mainProgram = "ldfparser"; homepage = "https://github.com/c4deszes/ldfparser"; changelog = "https://github.com/c4deszes/ldfparser/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ldfparser"; }; } diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix index 44a2a15a8f819..ea158b5cb2a1a 100644 --- a/pkgs/development/python-modules/linknlink/default.nix +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "linknlink"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,20 +18,14 @@ buildPythonPackage rec { owner = "xuanxuan000"; repo = "python-linknlink"; rev = "refs/tags/${version}"; - hash = "sha256-MOZw+7oFHeH7Vaj6pylR7wqe3ZyHcsiG+n8jnRAQ8PA="; + hash = "sha256-G0URNUHIh/td+A8MhIC0mePx2SmhEXhIzOpbVft33+w="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - cryptography - ]; + dependencies = [ cryptography ]; - pythonImportsCheck = [ - "linknlink" - ]; + pythonImportsCheck = [ "linknlink" ]; # Module has no test doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 1b301ffb1452e..d49c0f042f54a 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.32"; + version = "0.10.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-p+ye8o+paA6L8f1DiiiFJufyEqRn+ERNBWuhkoWfZb8="; + hash = "sha256-UlKZX7qWb8/XeqxNTW9PawKauwZRsMjsFP+xXI1CyeE="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index dd1ccf563b779..a96b2f57c8037 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-GexyfQSMhzkV1bA32aL+lWUgwBmxHXq4w8QG3RHzTks="; + hash = "sha256-x5ZlS3PRA/kyTtTFXHbEm3NzirxuUNAllu1eKxxm3sU="; }; build-system = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 8c546307434a1..73c20444860c5 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s="; + hash = "sha256-E7DXWubBvMhru31XmNva6iPm2adJKmmt5pFqKZ8fquk="; }; build-system = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index e81dd0ab4d243..15fcab2b3123c 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.5"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-9jE+1Gbx2y/CSqkpSfuYqgyX49yZwhwmJbiG/EHwTLw="; + hash = "sha256-00ccEfjYY8qrNYymHQ5w43w8zAHUAntO6oiwYUwaOVw="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 3988db9a8d28c..cbf4e46b499ee 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.46"; + version = "0.3.47"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MEYIvKwQLbQPgaEEpSXs6v1MUQ/txzU8D0Ivd/6TlMw="; + hash = "sha256-GDLI/Y6tWiI5JcmQJ7BnwvKPGwdAwJDN4yGOgINcdB8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index fd297474eb706..830a37164a5e0 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -1,57 +1,52 @@ -{ lib -, olefile -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, cryptography -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + olefile, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + cryptography, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.3.1"; - format = "pyproject"; + version = "5.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nolze"; - repo = pname; + repo = "msoffcrypto-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY="; + hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cryptography olefile setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test fails with AssertionError "test_cli" ]; - pythonImportsCheck = [ - "msoffcrypto" - ]; + pythonImportsCheck = [ "msoffcrypto" ]; meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys"; - mainProgram = "msoffcrypto-tool"; homepage = "https://github.com/nolze/msoffcrypto-tool"; changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "msoffcrypto-tool"; }; } diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index 6d4f6f43a8ee1..fbc52dd1fe2ed 100644 --- a/pkgs/development/python-modules/nebula3-python/default.nix +++ b/pkgs/development/python-modules/nebula3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.5.1"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9JpdCR8ewOJcvJ3fAg/AcMKtSz7NBIqWAuG9cofv0Ak="; + hash = "sha256-tpMm13iixtg3ZF4g7YgRLyd/VqJba51QPGPmFRpy0wA="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch b/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch deleted file mode 100644 index b9bc53e0b84df..0000000000000 --- a/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001 -From: Ralf Gommers <ralf.gommers@gmail.com> -Date: Thu, 26 Oct 2023 16:57:03 +0200 -Subject: [PATCH] BLD: remove last usage of `distutils` in - `_core/code_generators/` - ---- - numpy/core/code_generators/genapi.py | 9 --------- - numpy/core/code_generators/generate_numpy_api.py | 7 +------ - numpy/core/code_generators/generate_ufunc_api.py | 7 +------ - 3 files changed, 2 insertions(+), 21 deletions(-) - -diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py -index 2cdaba52d..d9d7862b2 100644 ---- a/numpy/core/code_generators/genapi.py -+++ b/numpy/core/code_generators/genapi.py -@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'): - fo.close() - return functions - --def should_rebuild(targets, source_files): -- from distutils.dep_util import newer_group -- for t in targets: -- if not os.path.exists(t): -- return True -- sources = API_FILES + list(source_files) + [__file__] -- if newer_group(sources, targets[0], missing='newer'): -- return True -- return False - - def write_file(filename, data): - """ -diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py -index ae38c4efc..640bae9e5 100644 ---- a/numpy/core/code_generators/generate_numpy_api.py -+++ b/numpy/core/code_generators/generate_numpy_api.py -@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = numpy_api.multiarray_api -- -- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): -diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py -index e03299a52..3734cbd6a 100644 ---- a/numpy/core/code_generators/generate_ufunc_api.py -+++ b/numpy/core/code_generators/generate_ufunc_api.py -@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = ['ufunc_api_order.txt'] -- -- if (not force and not genapi.should_rebuild(targets, sources + [__file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): --- -2.42.0 - diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index c9d851f49a6da..cde3bcc8ca347 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, future -, jsonschema -, pytestCheckHook -, python-dateutil -, pythonOlder -, pythonRelaxDepsHook -, requests -, responses -, setuptools -, vcrpy +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + jsonschema, + pytestCheckHook, + python-dateutil, + pythonOlder, + pythonRelaxDepsHook, + requests, + responses, + setuptools, + vcrpy, }: buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.5.2"; + version = "3.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,20 +25,14 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-GMLgph6mjDSDn2CCfeqcqFY2gjtziH4xVHJhYTGRYw8="; + hash = "sha256-iY0I5z+aDLQekjgHT5v/ZprCkCgNPkyImmmaCQgnoYc="; }; - pythonRelaxDeps = [ - "future" - ]; + pythonRelaxDeps = [ "future" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ future @@ -52,9 +47,7 @@ buildPythonPackage rec { vcrpy ]; - pythonImportsCheck = [ - "polyswarm_api" - ]; + pythonImportsCheck = [ "polyswarm_api" ]; meta = with lib; { description = "Library to interface with the PolySwarm consumer APIs"; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 74ca3b2e0874f..d732d0ce84a40 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.31"; + version = "1.9.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HUFJ2FP9WGcG9pkukS2LHIgPYFRAXAneiVK6VfYQ+zU="; + hash = "sha256-H235bZOzTxmmLEFje8hhYxrN4l1S34tD1LMhsymRy9w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix index be3a439c36074..8e1ba0bb644ec 100644 --- a/pkgs/development/python-modules/python-motionmount/default.nix +++ b/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-GXgshCARH4VPYHIIeWXwOCRmKgCyel4ydj/oKUWuyUM="; + hash = "sha256-F/nFo/PivnIogVwEh6MsQZQWg95kQMr6pZuf0SZa3n4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e29bc2d7abe85..a3d62043d901e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.100"; + version = "9.2.101"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-5CjpL6uxJjZN4GwYATVnX071XYRwCuEe7P/O4szAo3Y="; + hash = "sha256-zI86NYe0b9ppm9Zv6+zfB3UclhIm1TTqcC9vrBn3NR8="; }; build-system = [ diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index 70734fd59da32..c47817f21bbef 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, httpx -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, respx +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + httpx, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + respx, }: buildPythonPackage rec { pname = "pywaze"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,21 +21,17 @@ buildPythonPackage rec { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-n5W8TdZZJmT7SECXE8k6WK2lmCcucA6eLm+LZpojERo="; + hash = "sha256-sWI9kUR0SSqE97an/YfvhQqmrK+OEWXRzG4MBYyp8Jg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + --replace-fail "--cov --cov-report term-missing --cov=src/pywaze " "" ''; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - httpx - ]; + dependencies = [ httpx ]; nativeCheckInputs = [ pytest-asyncio @@ -42,9 +39,7 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ - "pywaze" - ]; + pythonImportsCheck = [ "pywaze" ]; meta = with lib; { description = "Module for calculating WAZE routes and travel times"; diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 4005a620d8a6e..2b6d9ba0ab19f 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "safetensors"; rev = "refs/tags/v${version}"; - hash = "sha256-hdPUI8k7CCQwt2C/AsjUHRmAL6ob+yCN97KkWtqOQL8="; + hash = "sha256-Rc+o7epQJ8qEvdgbFnGvXxBr/U4eULZwkKNEaPlJkyU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-7n9aYlha6IaPsZ2zMfD5EIkrk8ENwMBwj41s6QU7ml0="; + hash = "sha256-tzNEUvWgolSwX0t/JLgYcTEIv3/FiKxoTJ4VjFQs8AY="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix index 5f4435c91694e..8b70b6c63ee1b 100644 --- a/pkgs/development/python-modules/wikitextparser/default.nix +++ b/pkgs/development/python-modules/wikitextparser/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, flit-core , lib , setuptools , pytestCheckHook @@ -9,14 +10,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.55.5"; + version = "0.55.13"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys="; + hash = "sha256-qLctOX0BsKAn2JzfmV2sTLJ/KcNfaJFAjOB3pxd5LQI="; }; nativeBuildInputs = [ @@ -24,6 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + flit-core wcwidth regex ]; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 5daedfa2ebb86..accb456f11920 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-45jQt5VK7h02Frz5urB6dXap796OTfHsPx/Q1xumM00="; + hash = "sha256-eLLnSfuFnvlarpFBkhq3eumIyXOuuYU9ZJHpsKt0WQE="; }; - cargoHash = "sha256-+AKgEyKer9S2lTUF3VA4UXnbR0nUBErp2OdqFC84W00="; + cargoHash = "sha256-bTflBJ5Rz2Xdip2ptUyGi+CpR0ZN0ggVutSk1S9nW1c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 3f2ba448511a5..832e73869bd07 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.9.3"; + version = "2.9.4"; hash = { - x86_64-linux = "sha256-6VS21x2egWBV6eJqRCBGG7mEGPIDFtY9GN6Ry4ilC70="; - x86_64-darwin = "sha256-UBUGjA+jUkT6p9714l8IvDDI/qhWNctVFOvcA2S5kQU="; - aarch64-linux = "sha256-2QAahqcM2gi3lT+18q2Nm9GNqVsqzX3RajBsTn+KB1c="; - aarch64-darwin = "sha256-uEH7Y7c9BcU/Q/jwx/inFMvUrgm2dUruID+FJL+rA6Y="; + x86_64-linux = "sha256-Sw8wAx69oQFrr24Ukah+GfQvoyn2qX5LljZ398H6QFk="; + x86_64-darwin = "sha256-uSO2gVvyHTf4dWws0QVtfFUdluwJGkwpuYUDIlXwf+I="; + aarch64-linux = "sha256-qI43x2hL9X4GsG511PrEZN5MtRV8th1NRbtkbZ2gZ3A="; + aarch64-darwin = "sha256-KbUH2OeDqEXoRMx6kmMbe0tEcE3FLuSMkRoFFnfXLfE="; }; }; mainline = { - version = "2.10.1"; + version = "2.10.2"; hash = { - x86_64-linux = "sha256-jNPL30e5xvyajlIqivtEpSb3cRhfgFhLFlC+CaLY2IM="; - x86_64-darwin = "sha256-U1eQaYwnm/mdQoZ8YxK/+s3HboVfMIAtdI7aQnCiDM8="; - aarch64-linux = "sha256-YtSyKZYG8vdubZUfo2FjEoVwSF82TXzeLJjPpHqgFDk="; - aarch64-darwin = "sha256-aQSiXK7voP5/mPFIscfTnSc4Ae5/f+WW8MR6ZtuC/eY="; + x86_64-linux = "sha256-U3qHEjIKq8JkpDp6TehMs6t5L3GpSGt4D10XSAQ9Ii0="; + x86_64-darwin = "sha256-ibfqqxRRD3IfIN2FqSxk5qd7d87RvBgKKFv9F0hACgo="; + aarch64-linux = "sha256-HdBVnLKen6W1crZfnc2hpA0cAYIYeYFHKvANwnLqkjY="; + aarch64-darwin = "sha256-3sHmR6PTRlBSIdD4rja4y8v0gOY4cbbyhW7qssgpqp8="; }; }; }; diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 76c338e8a579f..299be547ce275 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -26,6 +26,20 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; + patches = [ + (fetchpatch { + name = "add-scrolling-layers.patch"; + url = "https://github.com/wagoodman/dive/pull/478/commits/b7da0f90880ce5e9d3bc2d0f269aadac6ee63c49.patch"; + hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc="; + }) + (fetchpatch { + name = "fix-render-update.patch"; + url = "https://github.com/wagoodman/dive/pull/478/commits/326fb0d8c9094ac068a29fecd4f103783199392c.patch"; + hash = "sha256-NC74MqHVChv/Z5hHX8ds3FI+tC+yyBpXvZKSFG3RyC0="; + }) + ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 405b63f54e5cb..86325a6815b37 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixd"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = finalAttrs.version; - hash = "sha256-4CApj9noGfV31em2S4dDGy2BV++FR0FkYBBBh+q0JRk="; + hash = "sha256-A6hoZ4fbWxd7Mx+r3e1HEw2IPaAn4WcMEIocy/ZCz28="; }; mesonBuildType = "release"; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index b8ef6ec8988d8..71a9a53a3fee5 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,24 +1,29 @@ { lib , stdenv , fetchFromGitHub -, zig_0_11 +, fetchurl +, zig_0_12 , callPackage }: stdenv.mkDerivation (finalAttrs: { pname = "zls"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "zigtools"; repo = "zls"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-WrbjJyc4pj7R4qExdzd0DOQ9Tz3TFensAfHdecBA8UI="; + hash = "sha256-2iVDPUj9ExgTooDQmCCtZs3wxBe2be9xjzAk9HedPNY="; }; + zigBuildFlags = [ + "-Dversion_data_path=${zig_0_12.src}/doc/langref.html.in" + ]; + nativeBuildInputs = [ - zig_0_11.hook + zig_0_12.hook ]; postPatch = '' diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/development/tools/language-servers/zls/deps.nix index 5c1b2ce89d3c6..4de50620ef9c7 100644 --- a/pkgs/development/tools/language-servers/zls/deps.nix +++ b/pkgs/development/tools/language-servers/zls/deps.nix @@ -4,24 +4,17 @@ linkFarm "zig-packages" [ { - name = "1220363c7e27b2d3f39de6ff6e90f9537a0634199860fea237a55ddb1e1717f5d6a5"; + name = "12201314cffeb40c5e4e3da166217d2c74628c74486414aaf97422bcd2279915b9fd"; path = fetchzip { - url = "https://gist.github.com/antlilja/8372900fcc09e38d7b0b6bbaddad3904/archive/6c3321e0969ff2463f8335da5601986cf2108690.tar.gz"; - hash = "sha256-m/kr4kmkG2rLkAj5YwvM0HmXTd+chAiQHzYK6ozpWlw="; + url = "https://github.com/ziglibs/known-folders/archive/bf79988adcfce166f848e4b11e718c1966365329.tar.gz"; + hash = "sha256-Q7eMdyScqj8qEiAHg1BnGRTsWSQOKWWTc6hUYHNlgGg="; }; } { - name = "122048992ca58a78318b6eba4f65c692564be5af3b30fbef50cd4abeda981b2e7fa5"; + name = "12200d71e4b7029ea56a429e24260c6c0e85a3069b0d4ba85eace21a0fd75910aa64"; path = fetchzip { - url = "https://github.com/ziglibs/known-folders/archive/fa75e1bc672952efa0cf06160bbd942b47f6d59b.tar.gz"; - hash = "sha256-U/h4bVarq8CFKbFyNXKl3vBRPubYooLxA1xUz3qMGPE="; - }; - } - { - name = "122089a8247a693cad53beb161bde6c30f71376cd4298798d45b32740c3581405864"; - path = fetchzip { - url = "https://github.com/ziglibs/diffz/archive/90353d401c59e2ca5ed0abe5444c29ad3d7489aa.tar.gz"; - hash = "sha256-3CdYo6WevT0alRwKmbABahjhFKz7V9rdkDUZ43VtDeU="; + url = "https://github.com/ziglibs/diffz/archive/e10bf15962e45affb3fcd7d9a950977a69c901b3.tar.gz"; + hash = "sha256-yVFPVn4jGfcoE2V4xdTqdThYPutshL6U4feDzetWgFw="; }; } ] diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix index ba30c6a4ffcd0..faffc0c0533ef 100644 --- a/pkgs/development/tools/misc/terser/default.nix +++ b/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.30.0"; + version = "5.30.4"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-d3vnCEb9HzydpxsuoX66KqUtgYYt/+L2AcpZNFDleoY="; + hash = "sha256-d0zxwUvXa+Nm9p8QkhBhXl73XfJ+dxxt+GHkFtI8Zuk="; }; - npmDepsHash = "sha256-wrxa6/TKYb/pqT4zjTVbfONSYqko12pVzBQ9Ojm7H2o="; + npmDepsHash = "sha256-7j3hMDVktQxolCMM27SH7y5ZtexnwF//ccilVZ0w5l8="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 1b7d679559066..ed67db03e5c84 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.2.4"; + version = "3.2.5"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-rOXQyIdyDT/YRuWgbbObFWnCOI+XEZ4+vGvIxJJ8CC4="; + hash = "sha256-NRJ5vL/tcm/CrNIEUh7gntLsLwWD9bL048Ycx1pRlQU="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index dee47ffab1223..37a096c0d758c 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.20.10"; + version = "1.21.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-1ZZhGEz3Em5snDBDnjACfh9mmZNDyS8PFpixQwYXQ+M="; + hash = "sha256-PvMa2hQYDu42ZzwBZrMQZy48RxUzHMvlLYEzPN3sh1w="; }; - cargoHash = "sha256-V/jyA+DB5QvwNLRwf+GAGCMuMbZkby2Hx7R927XGfH4="; + cargoHash = "sha256-P7pzyfv+0ckzVjC95a+YW6Ni3sLnqgjoZ4JlnfKO17M="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch b/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch deleted file mode 100644 index e21b53b3cc536..0000000000000 --- a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp ---- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -32,6 +32,7 @@ - #include <QInputDialog> - #include <QMessageBox> - #include <QToolBar> -+#include <QTabBar> - - DClass<IRCDock> : public Ui::IRCDock - { -diff -r c2c7f37b1afb src/core/gui/logdock.cpp ---- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,8 @@ - // Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com> - //------------------------------------------------------------------------------ - -+#include <QAction> -+ - #include "clipboard.h" - #include "logdock.h" - #include "log.h" -diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp ---- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,7 @@ - // Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net> - //------------------------------------------------------------------------------ - -+#include <QAction> - #include <QBoxLayout> - - #include "serverdetailsdock.h" -diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp ---- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -20,6 +20,9 @@ - //------------------------------------------------------------------------------ - // Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com> - //------------------------------------------------------------------------------ -+ -+#include <QAction> -+ - #include "serverfilterdock.h" - #include "ui_serverfilterdock.h" - diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix deleted file mode 100644 index ca57d11910aa6..0000000000000 --- a/pkgs/games/nxengine-evo/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv -, fetchpatch -, fetchurl -, fetchFromGitHub -, cmake -, libpng -, SDL2 -, SDL2_mixer -}: - -stdenv.mkDerivation rec { - pname = "nxengine-evo"; - version = "2.6.4"; - src = fetchFromGitHub { - owner = "nxengine"; - repo = "nxengine-evo"; - rev = "v${version}"; - sha256 = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A="; - }; - assets = fetchurl { - url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; - sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; - sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2"; - }) - (fetchpatch { - url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; - sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libpng - SDL2 - SDL2_mixer - ]; - - # Allow finding game assets. - postPatch = '' - sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp - ''; - - installPhase = '' - cd .. - unpackFile ${assets} - mkdir -p $out/bin/ $out/share/nxengine/ - install bin/* $out/bin/ - cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data - chmod -R a=r,a+X $out/share/nxengine/data - ''; - - meta = { - description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; - license = with lib.licenses; [ - gpl3 # Game engine - unfreeRedistributable # Game assets, freeware - ]; - maintainers = [ ]; - homepage = "https://github.com/nxengine/nxengine-evo"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 0ada82d0e7580..ca83bb7db4c00 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.76"; + version = "0.77"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-oHq5mLMWloi6Tf81rjcmUFGwIggtMdyLPqbD/gOzNHU="; + hash = "sha256-wViFngw6iwlOG7KsW+zqxjm9ZRJahscX0TYz7/7T5nw="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 19109c4efea8f..b69c0f9c6003d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,34 +1,34 @@ { "testing": { - "version": "6.9-rc5", - "hash": "sha256:1rk369sz6a4m1bm7zzxj8bpdma7rgybmx8frd54kp2l5mjp7brrp" + "version": "6.9-rc6", + "hash": "sha256:075l5vhk8zmwln4jks7gr5n5k67s65qvs07l2rpbc7a75fdp6c14" }, "6.1": { - "version": "6.1.88", - "hash": "sha256:1lgqclvcxfs5c4my6fh041gxzgzz8i64cw43cf5ichy58pyh4sb9" + "version": "6.1.90", + "hash": "sha256:07cfg0chssvpc4mqls3aln6s4lqjp6k4x2n63wndmkjgfqpdg8w3" }, "5.15": { - "version": "5.15.157", - "hash": "sha256:0554qxnai66mpm3p5dln9dfsb392zr8zvwfwc9ks2sadsd8j7wmg" + "version": "5.15.158", + "hash": "sha256:1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr" }, "5.10": { - "version": "5.10.215", - "hash": "sha256:1af6h86flx96pszg006agpak2f9dkk2jqaazfykd7aafqdcs3747" + "version": "5.10.216", + "hash": "sha256:0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473" }, "5.4": { - "version": "5.4.274", - "hash": "sha256:1m4yyyv48mfkzhqms88dv1jf39zsfp88az5zpqynmm1wlhhv9iza" + "version": "5.4.275", + "hash": "sha256:0k1hyknx854k8z27j4rq1gcp8l0xc0bspmrhc41a033gjilb1lns" }, "4.19": { - "version": "4.19.312", - "hash": "sha256:0jppa4p73pssd7m3jpc7i6rgnj9gawjcgk4wmqyy87ijzrgzm553" + "version": "4.19.313", + "hash": "sha256:1j1r4mrdh1ray468jr5i8d2afiswb653bhq0ck8bcdw4rwp5w558" }, "6.6": { - "version": "6.6.29", - "hash": "sha256:1l6bcz0pwiby6q79va063767d0jxkkaf8rpqvaqqcb08116gf9kz" + "version": "6.6.30", + "hash": "sha256:1ilwmgpgvddwkd9nx5999cb6z18scjyq7jklid26k1hg7f35nsmn" }, "6.8": { - "version": "6.8.8", - "hash": "sha256:1fiiyvwi6frn83z730w4mng2z4nwpspvhb6vjpxx3yk0snwxqk0w" + "version": "6.8.9", + "hash": "sha256:1dn9bgmf03bdfbmgq98d043702g808rjikxs2i9yia57iqiz21gr" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 92f71e6496ab7..3344808ca2789 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19536"; - sha256 = "1lwg4340nga0sn5jcsqrmqskf2cf4vvjhkbdl0h54bj3lcnbxaw4"; + rev = "19546"; + sha256 = "1yyj7pbfs02fki1rdxfj9gcrxdrl26igisy4fji7czcc9xbw03qm"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8d87ee3598ec6..b7840b554beee 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,16 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.28"; - suffix = "xanmod2"; - hash = "sha256-U5L7i/g808GuUZhLjHE+v0VOQVdTPe+Tnx/rLQoGxx4="; + version = "6.6.29"; + hash = "sha256-Be2VaW0DQDS0FJUwXM627QaNgrn1B3Hbyq+PiKb7b+k="; variant = "lts"; }; mainVariant = { - version = "6.8.7"; - suffix = "xanmod2"; - hash = "sha256-/RhtRASEedYI4Zf9pUiiyDD3SgOL46cutTXo68gjBg8="; + version = "6.8.8"; + hash = "sha256-6fT9vRjHw775m4ySUAUWU9R0dz/cWYYdZsPCwZjGiXM="; variant = "main"; }; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index a240c1aee990e..19a822fc6173d 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ETM7OTJEdySej9wrV9sth1JCJAtfBVdsPH8ndOBV118="; + sha256 = "sha256-C0/l5dt5HpSgpTw1rlQXWOh4CfCI8D/tKPTGNt67M08="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-pCUHDHKNaSoIPB3fS+Jf953YMI5cXcUOLF+YP62iPMo="; + vendorHash = "sha256-JIqQXS2iw3opeotpfqC16w7hdu+7XjxhIyVj2M+98ec="; subPackages = [ "." ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 20637c70129f0..40d832620c3fa 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -9,6 +9,7 @@ , shadow , procps , nixosTests +, fetchpatch }: let @@ -26,6 +27,15 @@ buildGoModule { }; vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; + patches = [ + # Reverts "cmd/tailscaled/tailscaled.service: revert recent hardening" + (fetchpatch { + url = "https://github.com/tailscale/tailscale/commit/2889fabaefc50040507ead652d6d2b212f476c2b.patch"; + hash = "sha256-DPBrv7kjSVXhmptUGGzOkaP4iXi/Bym3lvqy4otL9HE="; + revert = true; + }) + ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; diff --git a/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch b/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch deleted file mode 100644 index fd40d27ca8b5a..0000000000000 --- a/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb -index 3fee4259af9..53cc3107f46 100644 ---- a/lib/discourse_js_processor.rb -+++ b/lib/discourse_js_processor.rb -@@ -111,8 +111,6 @@ class DiscourseJsProcessor - - def self.generate_js_processor - Discourse::Utils.execute_command( -- "yarn", -- "--silent", - "esbuild", - "--log-level=warning", - "--bundle", diff --git a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch deleted file mode 100644 index 30493b543e38c..0000000000000 --- a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/discourse.rb b/lib/discourse.rb -index ea2a3cbafd..66454d9157 100644 ---- a/lib/discourse.rb -+++ b/lib/discourse.rb -@@ -62,7 +62,7 @@ module Discourse - fd.fsync() - end - -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end -@@ -76,7 +76,7 @@ module Discourse - FileUtils.mkdir_p(File.join(Rails.root, 'tmp')) - temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex) - execute_command('ln', '-s', source, temp_destination) -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 5d148754fd1b2..16c685351ea34 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.11"; + version = "0.5.13"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xZN9ifeI0cEz9i8JWTgvU0CZhukxwzJY6vwe7TJWkRc="; + sha256 = "sha256-zFsxX7pZc8Hm8XcKWZK5zE3XAYmFPT0IJKD0+zazaeI="; }; - cargoHash = "sha256-g1N7yziPbQthdNcwZeDbOQpGFePUf4LXqMyWkS6c1AQ="; + cargoHash = "sha256-NjNfMyNEliyJQuwWJ/owyKOz+P5gT8Ov0w298I6A/Bk="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 4a6dd2ef4baee..df3bba816f0de 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.7.3"; + version = "4.7.4"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-LRjlchhEXLTZDH3v2lkY3XN4tvXOHpedZBjkQ6rgeVc="; + hash = "sha256-NEivDkcMB6Upc8UJFFnCs4yjsENXP/qOK3X582VVbmY="; }; - vendorHash = "sha256-cAeEBJz4k2liivRsNF4FT4JPKsDVy2fLAYDg8NuJ81U="; + vendorHash = "sha256-12nrMAGS7CRTq2Dr8Lnm9B/HTZAzJOaJ8TqTOHknCRE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch b/pkgs/tools/admin/gam/signal_files_as_env_vars.patch deleted file mode 100644 index 640a416d8a3ab..0000000000000 --- a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/gam/__init__.py b/gam/__init__.py -index 1c187ce..b2de793 100755 ---- a/gam/__init__.py -+++ b/gam/__init__.py -@@ -549,22 +549,16 @@ def SetGlobalVariables(): - _getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION') - _getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION') - _getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE') -- _getOldSignalFile(GC_DEBUG_LEVEL, -- 'debug.gam', -- filePresentValue=4, -- fileAbsentValue=0) -- _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt') -- _getOldSignalFile(GC_NO_TDEMAIL, 'notdemail.txt') -- _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt') -+ _getOldEnvVar(GC_DEBUG_LEVEL, 'GAM_DEBUG') -+ _getOldEnvVar(GC_NO_BROWSER, 'GAM_NO_BROWSER') -+ _getOldEnvVar(GC_NO_TDEMAIL, 'GAM_NO_TDEMAIL') -+ _getOldEnvVar(GC_OAUTH_BROWSER, 'GAM_OAUTH_BROWSER') - # _getOldSignalFile(GC_NO_CACHE, u'nocache.txt') - # _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True) -- _getOldSignalFile(GC_NO_CACHE, -- 'allcache.txt', -- filePresentValue=False, -- fileAbsentValue=True) -- _getOldSignalFile(GC_NO_SHORT_URLS, 'noshorturls.txt') -- _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt') -- _getOldSignalFile(GC_ENABLE_DASA, FN_ENABLEDASA_TXT) -+ _getOldEnvVar(GC_NO_CACHE, 'GAM_NO_CACHE') -+ _getOldEnvVar(GC_NO_SHORT_URLS, 'GAM_NO_SHORT_URLS') -+ GC_Defaults[GC_NO_UPDATE_CHECK] = True -+ _getOldEnvVar(GC_ENABLE_DASA, FN_ENABLEDASA_TXT) - # Assign directories first - for itemName in GC_VAR_INFO: - if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY: --- -2.36.0 - diff --git a/pkgs/tools/misc/clipbuzz/default.nix b/pkgs/tools/misc/clipbuzz/default.nix index 9e1e3724b8993..1d4b614846a68 100644 --- a/pkgs/tools/misc/clipbuzz/default.nix +++ b/pkgs/tools/misc/clipbuzz/default.nix @@ -3,7 +3,7 @@ , fetchzip , libX11 , libXfixes -, zig_0_11 +, zig }: stdenv.mkDerivation (finalAttrs: { @@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + nativeBuildInputs = [ zig.hook ]; buildInputs = [ libX11 libXfixes ]; - meta = { + meta = { description = "Buzz on new X11 clipboard events"; homepage = "https://trong.loang.net/~cnx/clipbuzz"; license = lib.licenses.unlicense; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 067c40aab8db8..c930d2038149a 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.74.0"; + version = "1.74.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-diMg47aZvMpVtvSbg1nA2Sva7JnEBfh8ZU9AHcz+xno="; + hash = "sha256-QuusOxXcTp7c6zkj6L//jOXWwLUgrsUFtsUtrNZrkOk="; }; - vendorHash = "sha256-UbMR3yTabGSUqT30T81R/fGnWI4Mz7/utCjZ5Fq0MWU="; + vendorHash = "sha256-mDZOBwm3k3L4QqQA+1C3jRz46R7+4wwJg9BVNWB0F0A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 51f10640ccbb7..436e5ba480eed 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -129,6 +129,7 @@ "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; changelog = "https://github.com/linrunner/TLP/releases/tag/${version}"; platforms = platforms.linux; + mainProgram = "tlp"; maintainers = with maintainers; [ abbradar lovesegfault ]; license = licenses.gpl2Plus; }; diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 1cd4d1d606bf4..384e315bb8720 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "upterm"; - version = "0.13.3"; + version = "0.13.5"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-VGLQ0NtXHIBKyTjW+7rPbmRdhcY9CMUYAnUu3qbqv9A="; + hash = "sha256-uwWP/F8rCc1vJ7Y+84cazAnsJ30zoyxqkbT2E+FzYr8="; }; - vendorHash = "sha256-rbdYXRxnkl0v+bICSusGiyxb5TIGREiKuylycV3dcx4="; + vendorHash = "sha256-AYntKxSRO0FSKmOojIS1i9bdUA5Kp3WoI7ThUNw3RNw="; subPackages = [ "cmd/upterm" "cmd/uptermd" ]; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index d74b114a10fcf..5494b699ed4a4 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.37.4"; + version = "0.37.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-uu/w3D2pLC7fYwDbi/6qgM7kPCWH3WMDz/6ySLFkzEs="; + hash = "sha256-vUNOk0lvlI2K8tIgQVWDDkTwvO5gh9xnkdkx//vP1/U="; }; - vendorHash = "sha256-oVauzk6vZJSeub55s1cTc+brDoUYwauiMSgFuN0xCw4="; + vendorHash = "sha256-3Z8EiO48+OAg/TnoKUuokLBSXnUUrxe8ZgE1nrILFSg="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 942fbad6d2e9e..ee250c1d0ce72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4790,9 +4790,7 @@ with pkgs; clipster = callPackage ../tools/misc/clipster { }; - clockify = callPackage ../applications/office/clockify { - electron = electron_24; - }; + clockify = callPackage ../applications/office/clockify { }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -14765,7 +14763,9 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; - clipbuzz = callPackage ../tools/misc/clipbuzz { }; + clipbuzz = callPackage ../tools/misc/clipbuzz { + zig = zig_0_12; + }; xclip = callPackage ../tools/misc/xclip { }; @@ -16764,6 +16764,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { + zig = zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; @@ -16836,7 +16837,9 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; + cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { + zig = zig_0_12; + }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; @@ -20210,6 +20213,10 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { + zig = zig_0_11; + }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; bamf = callPackage ../development/libraries/bamf { }; @@ -25169,7 +25176,7 @@ with pkgs; zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { llvmPackages = llvmPackages_17; }; - zig = zig_0_11; + zig = zig_0_12; zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; @@ -25632,8 +25639,6 @@ with pkgs; asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; }); - sabnzbd = callPackage ../servers/sabnzbd { }; - baserow = callPackage ../servers/baserow { }; bftpd = callPackage ../servers/ftp/bftpd { }; @@ -32822,8 +32827,6 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; - melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; @@ -37187,8 +37190,6 @@ with pkgs; nudoku = callPackage ../games/nudoku { }; - nxengine-evo = callPackage ../games/nxengine-evo { }; - oilrush = callPackage ../games/oilrush { }; onscripter-en = callPackage ../games/onscripter-en { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42226374159fc..a247be4c7d330 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1253,7 +1253,7 @@ with self; { }; }; - AstroFITSHeader = buildPerlModule rec { + AstroFITSHeader = buildPerlModule { pname = "Astro-FITS-Header"; version = "3.09"; src = fetchurl { @@ -1358,7 +1358,7 @@ with self; { }; }; - AuthenKrb5Admin = buildPerlPackage rec { + AuthenKrb5Admin = buildPerlPackage { pname = "Authen-Krb5-Admin"; version = "0.17"; src = fetchurl { @@ -1836,7 +1836,7 @@ with self; { }; }; - BKeywords = buildPerlPackage rec { + BKeywords = buildPerlPackage { pname = "B-Keywords"; version = "1.26"; src = fetchurl { @@ -3627,7 +3627,7 @@ with self; { }; }; - ClassLoader = buildPerlPackage rec { + ClassLoader = buildPerlPackage { pname = "Class-Loader"; version = "2.03"; src = fetchurl { @@ -4529,7 +4529,7 @@ with self; { }; }; - ConvertBencode = buildPerlPackage rec { + ConvertBencode = buildPerlPackage { pname = "Convert-Bencode"; version = "1.03"; src = fetchurl { @@ -4557,7 +4557,7 @@ with self; { }; }; - ConvertUU = buildPerlPackage rec { + ConvertUU = buildPerlPackage { pname = "Convert-UU"; version = "0.5201"; src = fetchurl { @@ -5241,7 +5241,7 @@ with self; { }; }; - CryptRandom = buildPerlPackage rec { + CryptRandom = buildPerlPackage { pname = "Crypt-Random"; version = "1.54"; src = fetchurl { @@ -5552,7 +5552,7 @@ with self; { }; }; - CryptOpenSSLX509 = buildPerlPackage rec { + CryptOpenSSLX509 = buildPerlPackage { pname = "Crypt-OpenSSL-X509"; version = "1.915"; src = fetchurl { @@ -6961,7 +6961,7 @@ with self; { }; }; - DevelLeak = buildPerlPackage rec { + DevelLeak = buildPerlPackage { pname = "Devel-Leak"; version = "0.03"; src = fetchurl { @@ -9166,7 +9166,7 @@ with self; { }; }; - ExtUtilsF77 = buildPerlPackage rec { + ExtUtilsF77 = buildPerlPackage { pname = "ExtUtils-F77"; version = "1.26"; src = fetchurl { @@ -10538,7 +10538,7 @@ with self; { }; }; - FutureAsyncAwait = buildPerlModule rec { + FutureAsyncAwait = buildPerlModule { pname = "Future-AsyncAwait"; version = "0.66"; src = fetchurl { @@ -10772,7 +10772,7 @@ with self; { }; }; - GitAutofixup = buildPerlPackage rec { + GitAutofixup = buildPerlPackage { pname = "App-Git-Autofixup"; version = "0.004001"; src = fetchurl { @@ -11383,7 +11383,7 @@ with self; { propagatedBuildInputs = [ DateCalc ]; meta = { description = "Finnish APRS Parser (Fabulous APRS Parser)"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14610,7 +14610,7 @@ with self; { }; }; - LogJournald = buildPerlModule rec { + LogJournald = buildPerlModule { pname = "Log-Journald"; version = "0.30"; src = fetchurl { @@ -15727,7 +15727,7 @@ with self; { }; # TODO: use CPAN version - MHonArc = buildPerlPackage rec { + MHonArc = buildPerlPackage { pname = "MHonArc"; version = "2.6.24"; @@ -16142,7 +16142,7 @@ with self; { }; }; - ModuleCompile = buildPerlPackage rec { + ModuleCompile = buildPerlPackage { pname = "Module-Compile"; version = "0.38"; src = fetchurl { @@ -16598,16 +16598,16 @@ with self; { Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.35"; + version = "9.36"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.35.tar.gz"; - hash = "sha256-akpEbuB/ynxtty9dgXVA1oMwCcuN58zkxvskoV7n1Gs="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.36.tar.gz"; + hash = "sha256-UX7Pb9hqC3xhadVRAiOL+YUWGNt2L7ANTPDZTGJSAV8="; }; meta = { description = "Real-time web framework"; homepage = "https://mojolicious.org"; license = with lib.licenses; [ artistic2 ]; - maintainers = with maintainers; [ thoughtpolice sgo ]; + maintainers = with maintainers; [ marcusramberg sgo thoughtpolice ]; mainProgram = "mojo"; }; }; @@ -16836,7 +16836,7 @@ with self; { }; }; - Mojomysql = buildPerlPackage rec { + Mojomysql = buildPerlPackage { pname = "Mojo-mysql"; version = "1.26"; src = fetchurl { @@ -18218,7 +18218,7 @@ with self; { }; }; - MySQLDiff = buildPerlPackage rec { + MySQLDiff = buildPerlPackage { pname = "MySQL-Diff"; version = "0.60"; src = fetchurl { @@ -19168,7 +19168,7 @@ with self; { }; }; - NetSNPP = buildPerlPackage rec { + NetSNPP = buildPerlPackage { pname = "Net-SNPP"; version = "1.17"; src = fetchurl { @@ -19548,7 +19548,7 @@ with self; { }; }; - OpenAPIClient = buildPerlPackage rec { + OpenAPIClient = buildPerlPackage { pname = "OpenAPI-Client"; version = "1.07"; src = fetchurl { @@ -20259,7 +20259,7 @@ with self; { }; }; - PDL = buildPerlPackage rec { + PDL = buildPerlPackage { pname = "PDL"; version = "2.025"; src = fetchurl { @@ -20604,7 +20604,7 @@ with self; { }; }; - PerlTidy = buildPerlPackage rec { + PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; version = "20230912"; src = fetchurl { @@ -22313,7 +22313,7 @@ with self; { }; }; - SearchXapian = buildPerlPackage rec { + SearchXapian = buildPerlPackage { pname = "Search-Xapian"; version = "1.2.25.5"; src = fetchurl { @@ -22377,7 +22377,7 @@ with self; { }; }; - DeviceSerialPort = buildPerlPackage rec { + DeviceSerialPort = buildPerlPackage { pname = "Device-SerialPort"; version = "1.04"; src = fetchurl { @@ -22408,7 +22408,7 @@ with self; { }; }; - SessionToken = buildPerlPackage rec { + SessionToken = buildPerlPackage { pname = "Session-Token"; version = "1.503"; src = fetchurl { @@ -22483,7 +22483,7 @@ with self; { }; }; - SmartComments = buildPerlPackage rec { + SmartComments = buildPerlPackage { pname = "Smart-Comments"; version = "1.06"; src = fetchurl { @@ -22977,7 +22977,7 @@ with self; { }; }; - StatisticsChiSquare = buildPerlPackage rec { + StatisticsChiSquare = buildPerlPackage { pname = "Statistics-ChiSquare"; version = "1.0000"; src = fetchurl { @@ -25602,7 +25602,7 @@ with self; { }; }; - TestPerlTidy = buildPerlModule rec { + TestPerlTidy = buildPerlModule { pname = "Test-PerlTidy"; version = "20230226"; src = fetchurl { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4f0c0d4219cf0..e75f863bbcbce 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -150,6 +150,7 @@ mapAliases ({ factory_boy = factory-boy; # added 2023-10-08 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03 + fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 inherit (super.pkgs) fetchPypi; # added 2023-05-25 filebrowser_safe = filebrowser-safe; # added 2024-01-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d679aa003f5eb..754a18310412c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4115,8 +4115,6 @@ self: super: with self; { fastnumbers = callPackage ../development/python-modules/fastnumbers { }; - fastpair = callPackage ../development/python-modules/fastpair { }; - fastparquet = callPackage ../development/python-modules/fastparquet { }; fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; |