Merge staging-next into staging

authored by nixpkgs-ci[bot] and committed by GitHub 09647166 5b28aeac

+884 -177
+2
doc/release-notes/rl-2511.section.md
··· 30 30 31 31 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input. 32 32 33 + - `neovimUtils.makeNeovimConfig` now uses `customLuaRC` parameter instead of accepting `luaRcContent`. The old usage is deprecated but still works with a warning. 34 + 33 35 - `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms. 34 36 35 37 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatable due to major api changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
+154 -14
nixos/tests/vector/dnstap.nix
··· 42 42 services.clickhouse.enable = true; 43 43 }; 44 44 45 + knot = 46 + { 47 + config, 48 + nodes, 49 + pkgs, 50 + ... 51 + }: 52 + let 53 + exampleZone = pkgs.writeTextDir "example.com.zone" '' 54 + @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800 55 + @ NS ns1 56 + @ NS ns2 57 + ns1 A 192.168.0.1 58 + ns1 AAAA fd00::1 59 + ns2 A 192.168.0.2 60 + ns2 AAAA fd00::2 61 + www A 192.0.2.1 62 + www AAAA 2001:DB8::1 63 + sub NS ns.example.com. 64 + ''; 65 + 66 + knotZonesEnv = pkgs.buildEnv { 67 + name = "knot-zones"; 68 + paths = [ 69 + exampleZone 70 + ]; 71 + }; 72 + in 73 + { 74 + networking.firewall.allowedUDPPorts = [ 53 ]; 75 + 76 + services.vector = { 77 + enable = true; 78 + 79 + settings = { 80 + sources = { 81 + dnstap = { 82 + type = "dnstap"; 83 + multithreaded = true; 84 + mode = "unix"; 85 + lowercase_hostnames = true; 86 + socket_file_mode = 504; 87 + socket_path = "${dnstapSocket}"; 88 + }; 89 + }; 90 + 91 + sinks = { 92 + vector_dnstap_sink = { 93 + type = "vector"; 94 + inputs = [ "dnstap" ]; 95 + address = "clickhouse:6000"; 96 + }; 97 + }; 98 + }; 99 + }; 100 + 101 + systemd.services.vector.serviceConfig = { 102 + RuntimeDirectory = "vector"; 103 + RuntimeDirectoryMode = "0770"; 104 + }; 105 + 106 + services.knot = { 107 + enable = true; 108 + settings = { 109 + server = { 110 + listen = [ 111 + "0.0.0.0@53" 112 + "::@53" 113 + ]; 114 + automatic-acl = true; 115 + }; 116 + template.default = { 117 + storage = knotZonesEnv; 118 + dnssec-signing = false; 119 + # Input-only zone files 120 + # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 121 + # prevents modification of the zonefiles, since the zonefiles are immutable 122 + zonefile-sync = -1; 123 + zonefile-load = "difference"; 124 + journal-content = "changes"; 125 + global-module = "mod-dnstap/capture_all"; 126 + }; 127 + zone = { 128 + "example.com".file = "example.com.zone"; 129 + }; 130 + 131 + mod-dnstap = [ 132 + { 133 + id = "capture_all"; 134 + sink = "unix:${dnstapSocket}"; 135 + } 136 + ]; 137 + }; 138 + }; 139 + 140 + systemd.services.knot = { 141 + after = [ "vector.service" ]; 142 + wants = [ "vector.service" ]; 143 + serviceConfig = { 144 + # DNSTAP access 145 + ReadWritePaths = [ "/var/run/vector" ]; 146 + SupplementaryGroups = [ "vector" ]; 147 + }; 148 + }; 149 + }; 150 + 45 151 unbound = 46 - { config, pkgs, ... }: 152 + { 153 + config, 154 + nodes, 155 + pkgs, 156 + ... 157 + }: 47 158 { 48 159 networking.firewall.allowedUDPPorts = [ 53 ]; 49 160 ··· 110 221 ]; 111 222 }; 112 223 224 + forward-zone = [ 225 + { 226 + name = "example.com."; 227 + forward-addr = [ 228 + nodes.knot.networking.primaryIPv6Address 229 + nodes.knot.networking.primaryIPAddress 230 + ]; 231 + } 232 + ]; 233 + 113 234 dnstap = { 114 235 dnstap-enable = "yes"; 115 236 dnstap-socket-path = "${dnstapSocket}"; ··· 175 296 ) 176 297 ENGINE = MergeTree() 177 298 PARTITION BY toYYYYMM(timestamp) 178 - ORDER BY (serverId, timestamp) 299 + ORDER BY (serverId, toStartOfHour(timestamp), domain, timestamp) 179 300 POPULATE AS 180 301 SELECT 181 302 timestamp, ··· 186 307 WHERE messageTypeId = 5 # ClientQuery 187 308 ''; 188 309 189 - selectQuery = pkgs.writeText "select.sql" '' 310 + selectDomainCountQuery = pkgs.writeText "select-domain-count.sql" '' 190 311 SELECT 191 312 domain, 192 313 count(domain) 193 314 FROM dnstap.domains_view 194 315 GROUP BY domain 195 316 ''; 317 + 318 + selectAuthResponseQuery = pkgs.writeText "select-auth-response.sql" '' 319 + SELECT 320 + * 321 + FROM dnstap.records 322 + WHERE messageType = 'AuthResponse' 323 + ''; 196 324 in 197 325 '' 198 326 clickhouse.wait_for_unit("clickhouse") ··· 205 333 "cat ${tableView} | clickhouse-client", 206 334 ) 207 335 336 + knot.wait_for_unit("knot") 208 337 unbound.wait_for_unit("unbound") 209 - unbound.wait_for_unit("vector") 210 338 211 - unbound.wait_until_succeeds( 212 - "journalctl -o cat -u vector.service | grep 'Socket permissions updated to 0o770'" 213 - ) 214 - unbound.wait_until_succeeds( 215 - "journalctl -o cat -u vector.service | grep 'component_type=dnstap' | grep 'Listening... path=\"${dnstapSocket}\"'" 216 - ) 339 + for machine in knot, unbound: 340 + machine.wait_for_unit("vector") 217 341 218 - unbound.wait_for_file("${dnstapSocket}") 219 - unbound.succeed("test 770 -eq $(stat -c '%a' ${dnstapSocket})") 342 + machine.wait_until_succeeds( 343 + "journalctl -o cat -u vector.service | grep 'Socket permissions updated to 0o770'" 344 + ) 345 + machine.wait_until_succeeds( 346 + "journalctl -o cat -u vector.service | grep 'component_type=dnstap' | grep 'Listening... path=\"${dnstapSocket}\"'" 347 + ) 348 + 349 + machine.wait_for_file("${dnstapSocket}") 350 + machine.succeed("test 770 -eq $(stat -c '%a' ${dnstapSocket})") 220 351 221 352 dnsclient.systemctl("start network-online.target") 222 353 dnsclient.wait_for_unit("network-online.target") 223 354 dnsclient.succeed( 224 - "dig @unbound test.local" 355 + "dig @unbound test.local", 356 + "dig @unbound www.example.com" 225 357 ) 226 358 227 359 unbound.wait_for_file("/var/lib/vector/logs.log") ··· 234 366 ) 235 367 236 368 clickhouse.log(clickhouse.wait_until_succeeds( 237 - "cat ${selectQuery} | clickhouse-client | grep 'test.local.'" 369 + "cat ${selectDomainCountQuery} | clickhouse-client | grep 'test.local.'" 370 + )) 371 + 372 + clickhouse.log(clickhouse.wait_until_succeeds( 373 + "cat ${selectDomainCountQuery} | clickhouse-client | grep 'www.example.com.'" 374 + )) 375 + 376 + clickhouse.log(clickhouse.wait_until_succeeds( 377 + "cat ${selectAuthResponseQuery} | clickhouse-client | grep 'Knot DNS ${pkgs.knot-dns.version}'" 238 378 )) 239 379 ''; 240 380 }
+57 -3
nixos/tests/vector/journald-clickhouse.nix
··· 10 10 m = {} 11 11 m.app = .SYSLOG_IDENTIFIER 12 12 m.host = .host 13 + m.boot_id = ._BOOT_ID 13 14 m.severity = to_int(.PRIORITY) ?? 0 14 15 m.level = to_syslog_level(m.severity) ?? "" 15 16 m.message = strip_ansi_escape_codes!(.message) ··· 60 61 "vector_source" 61 62 ]; 62 63 endpoint = "http://localhost:8123"; 64 + auth = { 65 + strategy = "basic"; 66 + user = "vector"; 67 + password = "helloclickhouseworld"; 68 + }; 63 69 database = "journald"; 64 70 table = "logs"; 65 71 date_time_best_effort = true; ··· 72 78 services.clickhouse = { 73 79 enable = true; 74 80 }; 81 + 82 + # ACL configuration for Vector 83 + environment = { 84 + etc."clickhouse-server/users.d/vector.xml".text = '' 85 + <clickhouse> 86 + <users> 87 + <vector> 88 + <password>helloclickhouseworld</password> 89 + 90 + <access_management>0</access_management> 91 + 92 + <quota>default</quota> 93 + <default_database>journald</default_database> 94 + 95 + <grants> 96 + <query>GRANT INSERT ON journald.logs</query> 97 + </grants> 98 + </vector> 99 + </users> 100 + </clickhouse> 101 + ''; 102 + 103 + # ACL configuration for read-only client 104 + etc."clickhouse-server/users.d/grafana.xml".text = '' 105 + <clickhouse> 106 + <users> 107 + <grafana> 108 + <password>helloclickhouseworld2</password> 109 + 110 + <access_management>0</access_management> 111 + 112 + <quota>default</quota> 113 + <default_database>journald</default_database> 114 + 115 + <grants> 116 + <query>GRANT SELECT ON journald.logs</query> 117 + </grants> 118 + </grafana> 119 + </users> 120 + </clickhouse> 121 + ''; 122 + }; 75 123 }; 76 124 77 125 vector = ··· 108 156 databaseDDL = pkgs.writeText "database.sql" "CREATE DATABASE IF NOT EXISTS journald"; 109 157 110 158 # https://clickhouse.com/blog/storing-log-data-in-clickhouse-fluent-bit-vector-open-telemetry 159 + # ORDER BY advice: https://kb.altinity.com/engines/mergetree-table-engine-family/pick-keys/ 111 160 tableDDL = pkgs.writeText "table.sql" '' 112 161 CREATE TABLE IF NOT EXISTS journald.logs ( 113 162 timestamp DateTime64(6), 163 + host LowCardinality(String), 164 + boot_id LowCardinality(String), 114 165 app LowCardinality(String), 115 - host LowCardinality(String), 116 166 level LowCardinality(String), 117 167 severity UInt8, 118 168 message String, ··· 120 170 pid UInt32, 121 171 ) 122 172 ENGINE = MergeTree() 123 - ORDER BY (host, app, timestamp) 173 + ORDER BY (host, boot_id, toStartOfHour(timestamp), app, timestamp) 124 174 PARTITION BY toYYYYMM(timestamp) 125 175 ''; 126 176 ··· 148 198 "journalctl -o cat -u vector.service | grep 'Vector has started'" 149 199 ) 150 200 201 + clickhouse.fail( 202 + "cat ${selectQuery} | clickhouse-client --user vector --password helloclickhouseworld | grep 2" 203 + ) 204 + 151 205 clickhouse.wait_until_succeeds( 152 - "cat ${selectQuery} | clickhouse-client | grep 2" 206 + "cat ${selectQuery} | clickhouse-client --user grafana --password helloclickhouseworld2 | grep 2" 153 207 ) 154 208 ''; 155 209 }
+5 -1
pkgs/applications/editors/neovim/utils.nix
··· 84 84 attrs 85 85 // { 86 86 neovimRcContent = customRC; 87 - luaRcContent = customLuaRC; 87 + luaRcContent = 88 + if attrs ? luaRcContent then 89 + lib.warn "makeNeovimConfig: luaRcContent parameter is deprecated. Please use customLuaRC instead." attrs.luaRcContent 90 + else 91 + customLuaRC; 88 92 wrapperArgs = lib.optionals (luaEnv != null) [ 89 93 "--prefix" 90 94 "LUA_PATH"
+2 -2
pkgs/applications/editors/vscode/extensions/default.nix
··· 1591 1591 # semver scheme, contrary to preview versions which are listed on 1592 1592 # the VSCode Marketplace and use a calver scheme. We should avoid 1593 1593 # using preview versions, because they expire after two weeks. 1594 - version = "17.2.0"; 1595 - hash = "sha256-jruhqXJfCACYBFUbPCL22nhqCSrm1QFSMIpsPguQ6J8="; 1594 + version = "17.2.1"; 1595 + hash = "sha256-1p4DDZEFFOIFHV6bkduXmrUGhjMDwrqf5/U2tO00iD0="; 1596 1596 }; 1597 1597 meta = { 1598 1598 changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
+2 -2
pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
··· 9 9 mktplcRef = { 10 10 name = "jupyter"; 11 11 publisher = "ms-toolsai"; 12 - version = "2025.4.1"; 13 - hash = "sha256-RLkelWU5chIpGS6dToQ+/jNeEbZYGi2JxeZTqqHAdVA="; 12 + version = "2025.5.0"; 13 + hash = "sha256-3tMuPAyTjvryiHOk0ozIQ8KqIqBV/kxJM01fgC5ZMWE="; 14 14 }; 15 15 16 16 nativeBuildInputs = [
+8 -8
pkgs/applications/editors/vscode/vscode.nix
··· 36 36 37 37 hash = 38 38 { 39 - x86_64-linux = "sha256-Rr7JNWloV4VkgGk9zDEnD/WRHSYv5su8UrOSIl3247c="; 40 - x86_64-darwin = "sha256-hHAJVmFKwD0Z8YyqvNlM4SpWnSIniVvdMwR3fhk/mKE="; 41 - aarch64-linux = "sha256-/pYykG/1IJU7aJ9wtO5oo3dUdCGtfxklre0SGMpgnq8="; 42 - aarch64-darwin = "sha256-pWMCQlgxoJ4EGfycuz3H76r9Sc3x006el1ITOM6E4wE="; 43 - armv7l-linux = "sha256-M0fK1n/HMuNQvN85I4g5GV8QAg3n6vQtR6V/B1PFAwQ="; 39 + x86_64-linux = "sha256-72KrCDUBe+xJjnSY/nnrNH92EP4tp71x1fadh0Pe0DM="; 40 + x86_64-darwin = "sha256-Ua3oh0Hv0oiW15u3Rb0pSYu+JD8m1oYMAm5pEzXD6Rw="; 41 + aarch64-linux = "sha256-5L0ZArj+7M5dhZDGzYj6NaxYYZEb8q89Vhngvjuw7wQ="; 42 + aarch64-darwin = "sha256-uWOF/QGgXocKZAkFMN4Kh7HjiQTSIi+PVPy3V90wrAA="; 43 + armv7l-linux = "sha256-FyGPvQeVz8yLhLjFGtCXPTVPvCB0/EX6pRe5RCAmXTU="; 44 44 } 45 45 .${system} or throwSystem; 46 46 in 47 47 callPackage ./generic.nix rec { 48 48 # Please backport all compatible updates to the stable release. 49 49 # This is important for the extension ecosystem. 50 - version = "1.101.1"; 50 + version = "1.101.2"; 51 51 pname = "vscode" + lib.optionalString isInsiders "-insiders"; 52 52 53 53 # This is used for VS Code - Remote SSH test 54 - rev = "18e3a1ec544e6907be1e944a94c496e302073435"; 54 + rev = "2901c5ac6db8a986a5666c3af51ff804d05af0d4"; 55 55 56 56 executableName = "code" + lib.optionalString isInsiders "-insiders"; 57 57 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; ··· 75 75 src = fetchurl { 76 76 name = "vscode-server-${rev}.tar.gz"; 77 77 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; 78 - hash = "sha256-Myq0OUrwv6bq53Q5FDCVtt+wfGlEX2bjz9CMeVLfd+4="; 78 + hash = "sha256-Bocoiz8pxQNAZxmWdOgh+y44QTnqvDjcqFCodny7VoY="; 79 79 }; 80 80 stdenv = stdenvNoCC; 81 81 };
+2 -2
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
··· 9 9 10 10 buildMozillaMach rec { 11 11 pname = "firefox"; 12 - version = "140.0.1"; 12 + version = "140.0.2"; 13 13 src = fetchurl { 14 14 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; 15 - sha512 = "d521405f49a38b8449a24f90e5ea14d4337085918779d93d282cec80b2627f381648529d6f69930eb6e90e37302797b0049fec5846d25dc40f556bbd86d55ef1"; 15 + sha512 = "11d3295c82835668f43a888bd5aada22248776e033aecc7558348e6ee26626bf4b65bbaae2680f7285a6b2b6209ec5d4aea453f1e0603544cd48bf45c735b2ea"; 16 16 }; 17 17 18 18 meta = {
+7 -2
pkgs/applications/networking/remote/citrix-workspace/generic.nix
··· 90 90 ''; 91 91 }; 92 92 93 - libxml2' = libxml2.overrideAttrs rec { 93 + libxml2' = libxml2.overrideAttrs (oldAttrs: rec { 94 94 version = "2.13.8"; 95 95 src = fetchurl { 96 96 url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; 97 97 hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; 98 98 }; 99 - }; 99 + meta = oldAttrs.meta // { 100 + knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ 101 + "CVE-2025-6021" 102 + ]; 103 + }; 104 + }); 100 105 101 106 in 102 107
+57
pkgs/by-name/bi/bink-player/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + autoPatchelfHook, 6 + p7zip, 7 + libGL, 8 + libX11, 9 + }: 10 + 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "bink-player"; 13 + version = "2025.05"; 14 + 15 + src = fetchurl { 16 + url = "https://web.archive.org/web/20250602103030if_/https://www.radgametools.com/down/Bink/BinkLinuxPlayer.7z"; 17 + hash = "sha256-A3IDQtdYlIcU2U8uieQI6xe1SvW4BqH+5ZwPYJxr83M="; 18 + }; 19 + 20 + unpackPhase = '' 21 + runHook preUnpack 22 + 23 + 7z x $src 24 + 25 + runHook postUnpack 26 + ''; 27 + 28 + nativeBuildInputs = [ 29 + autoPatchelfHook 30 + p7zip 31 + ]; 32 + 33 + buildInputs = [ 34 + stdenv.cc.cc.lib 35 + libGL 36 + libX11 37 + ]; 38 + 39 + installPhase = '' 40 + runHook preInstall 41 + 42 + install -Dm755 BinkPlayer64 -t $out/bin/ 43 + install -Dm755 BinkPlayer -t $out/bin/ 44 + 45 + runHook postInstall 46 + ''; 47 + 48 + meta = { 49 + description = "Play videos in the Bink format"; 50 + homepage = "https://www.radgametools.com/bnkmain.htm"; 51 + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; 52 + license = lib.licenses.unfree; 53 + mainProgram = "BinkPlayer64"; 54 + maintainers = with lib.maintainers; [ nilathedragon ]; 55 + platforms = [ "x86_64-linux" ]; 56 + }; 57 + })
+7 -2
pkgs/by-name/ci/ciscoPacketTracer7/package.nix
··· 50 50 ]; 51 51 }; 52 52 53 - libxml2' = libxml2.overrideAttrs rec { 53 + libxml2' = libxml2.overrideAttrs (oldAttrs: rec { 54 54 version = "2.13.8"; 55 55 src = fetchurl { 56 56 url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; 57 57 hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; 58 58 }; 59 - }; 59 + meta = oldAttrs.meta // { 60 + knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ 61 + "CVE-2025-6021" 62 + ]; 63 + }; 64 + }); 60 65 61 66 fhs = buildFHSEnv { 62 67 pname = "packettracer7";
+7 -2
pkgs/by-name/ci/ciscoPacketTracer8/package.nix
··· 41 41 "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb"; 42 42 }; 43 43 44 - libxml2' = libxml2.overrideAttrs rec { 44 + libxml2' = libxml2.overrideAttrs (oldAttrs: rec { 45 45 version = "2.13.8"; 46 46 src = fetchurl { 47 47 url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; 48 48 hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; 49 49 }; 50 - }; 50 + meta = oldAttrs.meta // { 51 + knownVulnerabilities = oldAttrs.meta.knownVulnerabilities or [ ] ++ [ 52 + "CVE-2025-6021" 53 + ]; 54 + }; 55 + }); 51 56 52 57 unwrapped = stdenvNoCC.mkDerivation { 53 58 name = "ciscoPacketTracer8-unwrapped";
+3 -3
pkgs/by-name/gi/github-mcp-server/package.nix
··· 7 7 8 8 buildGoModule (finalAttrs: { 9 9 pname = "github-mcp-server"; 10 - version = "0.5.0"; 10 + version = "0.6.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "github"; 14 14 repo = "github-mcp-server"; 15 15 tag = "v${finalAttrs.version}"; 16 - hash = "sha256-dbzO8yTAIfdAwcZEdoJqp+loPQea8iRSsAHdk2DfZ2A="; 16 + hash = "sha256-jW/X8vwV47J20aa3E+WqjRL5n9H+Pb2EQwIVIg1pfug="; 17 17 }; 18 18 19 - vendorHash = "sha256-gVR7Md3xYrPpeMhHRTKCQKCJvRRIl85uXo+QwlVaPzk="; 19 + vendorHash = "sha256-GYfK5QQH0DhoJqc4ynZBWuhhrG5t6KoGpUkZPSfWfEQ="; 20 20 21 21 ldflags = [ 22 22 "-s"
+2 -2
pkgs/by-name/he/headphones/package.nix
··· 7 7 8 8 python3.pkgs.buildPythonApplication rec { 9 9 pname = "headphones"; 10 - version = "0.6.3"; 10 + version = "0.6.4"; 11 11 format = "other"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "rembo10"; 15 15 repo = "headphones"; 16 16 rev = "v${version}"; 17 - sha256 = "195v0ylhqd49bqq3dpig5nh0kivmwgmn0977fknix9j14jpvmd3b"; 17 + sha256 = "0gv7rasjbm4rf9izghibgf5fbjykvzv0ibqc2in1naagjivqrpq4"; 18 18 }; 19 19 20 20 dontBuild = true;
+29
pkgs/by-name/ht/html2text/gettext-0.25.patch
··· 1 + diff --git a/Makefile.am b/Makefile.am 2 + index af28077..e746147 100644 3 + --- a/Makefile.am 4 + +++ b/Makefile.am 5 + @@ -13,6 +13,8 @@ 6 + AUTOMAKE_OPTIONS = foreign 7 + ACLOCAL_AMFLAGS = -I m4 8 + 9 + +SUBDIRS = 10 + + 11 + AM_YFLAGS = -d -Wno-yacc 12 + 13 + bin_PROGRAMS = html2text 14 + diff --git a/configure.ac b/configure.ac 15 + index 999c6fe..30c2536 100644 16 + --- a/configure.ac 17 + +++ b/configure.ac 18 + @@ -15,8 +15,11 @@ 19 + 20 + AC_PREREQ([2.71]) 21 + AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS]) 22 + +AC_CONFIG_MACRO_DIRS([m4]) 23 + AM_INIT_AUTOMAKE 24 + AM_MAINTAINER_MODE([disable]) 25 + +AM_GNU_GETTEXT_VERSION([0.20]) 26 + +AM_GNU_GETTEXT([external]) 27 + AM_ICONV 28 + #AC_CONFIG_SRCDIR([html.h]) 29 + #AC_CONFIG_HEADERS([config.h])
+16 -3
pkgs/by-name/ht/html2text/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitLab, 5 + autoconf-archive, 5 6 autoreconfHook, 7 + bison, 8 + gettext, 6 9 libiconv, 7 10 }: 8 11 9 12 stdenv.mkDerivation rec { 10 13 pname = "html2text"; 11 - version = "2.2.3"; 14 + version = "2.3.0"; 12 15 13 16 src = fetchFromGitLab { 14 17 owner = "grobian"; 15 18 repo = "html2text"; 16 19 rev = "v${version}"; 17 - hash = "sha256-7Ch51nJ5BeRqs4PEIPnjCGk+Nm2ydgJQCtkcpihXun8="; 20 + hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ="; 18 21 }; 19 22 20 - nativeBuildInputs = [ autoreconfHook ]; 23 + nativeBuildInputs = [ 24 + autoconf-archive 25 + autoreconfHook 26 + bison 27 + gettext 28 + ]; 29 + 30 + # These changes have all been made in HEAD, across several commits 31 + # amongst other changes. 32 + # See https://gitlab.com/grobian/html2text/-/merge_requests/57 33 + patches = [ ./gettext-0.25.patch ]; 21 34 22 35 buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; 23 36
+2 -2
pkgs/by-name/lu/lunatask/package.nix
··· 6 6 }: 7 7 8 8 let 9 - version = "2.0.22"; 9 + version = "2.1.1"; 10 10 pname = "lunatask"; 11 11 12 12 src = fetchurl { 13 13 url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; 14 - hash = "sha256-5V4h7x9NMZPAEinWmvhcBj8WrtKXp7naacSaMOEzwl0="; 14 + hash = "sha256-2ks5sqE0NuVa3fyJzKJ/466Ztq9M/RhDxHZCL8tSwo4="; 15 15 }; 16 16 17 17 appimageContents = appimageTools.extract {
+2 -2
pkgs/by-name/mi/microsoft-edge/package.nix
··· 179 179 180 180 stdenvNoCC.mkDerivation (finalAttrs: { 181 181 pname = "microsoft-edge"; 182 - version = "137.0.3296.93"; 182 + version = "138.0.3351.55"; 183 183 184 184 src = fetchurl { 185 185 url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; 186 - hash = "sha256-SC8h6UQ/ee5ZlQWAZsmC1Co5Ky4kaXuoMpvVZtTIMHQ="; 186 + hash = "sha256-SZCtAjhzY8BqwM9IMS2081RWxRT+4gQgrjve7avM7Bo="; 187 187 }; 188 188 189 189 # With strictDeps on, some shebangs were not being patched correctly
+2 -2
pkgs/by-name/op/open-policy-agent/package.nix
··· 14 14 15 15 buildGoModule (finalAttrs: { 16 16 pname = "open-policy-agent"; 17 - version = "1.5.1"; 17 + version = "1.6.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "open-policy-agent"; 21 21 repo = "opa"; 22 22 tag = "v${finalAttrs.version}"; 23 - hash = "sha256-gIwi+38oUBEVK5DiTU8Avt+lQtXaIf/udyVi4LLvTu8="; 23 + hash = "sha256-p03yjLPphS4jp0dK3hlREKzAzCKRPOpvUnmGaGzrwww="; 24 24 }; 25 25 26 26 vendorHash = null;
+2 -2
pkgs/by-name/pa/parca-debuginfo/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "parca-debuginfo"; 9 - version = "0.12.0"; 9 + version = "0.12.2"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "parca-dev"; 13 13 repo = "parca-debuginfo"; 14 14 tag = "v${version}"; 15 - hash = "sha256-FXi/iLVDdzyfClRD1tk0FQ9oF5zxW2dfGl4JuDPyZQE="; 15 + hash = "sha256-tJ3Xc5b9XnTL460u11RkCmbIc41vHKql/oZ7enTaPgQ="; 16 16 }; 17 17 18 18 vendorHash = "sha256-bH7Y1y9BDMQJGtYfEaSrq+sWVLnovvV/uGbutJUXV2w=";
+3 -3
pkgs/by-name/pa/patch2pr/package.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "patch2pr"; 11 - version = "0.35.0"; 11 + version = "0.36.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "bluekeyes"; 15 15 repo = "patch2pr"; 16 16 rev = "v${version}"; 17 - hash = "sha256-dj8xDTl7S1XETJqDI61rdRvQebJ4xgit+xc1xRyaV4M="; 17 + hash = "sha256-KaU77UYJJqcTJZrFPiqcdzYIVoih6oSeaPWiQdDiZ2s="; 18 18 }; 19 19 20 - vendorHash = "sha256-pn2x6f+N9VYncc490VtPzXkJxwC0nZgj4pDNB+no2Lo="; 20 + vendorHash = "sha256-MO6LrUvSu7pYidtjaDgjIEAxoIKM/U9hcePZr336Mbw="; 21 21 22 22 ldflags = [ 23 23 "-X main.version=${version}"
+2 -2
pkgs/by-name/pe/petsc/package.nix
··· 111 111 in 112 112 stdenv.mkDerivation (finalAttrs: { 113 113 pname = "petsc"; 114 - version = "3.23.3"; 114 + version = "3.23.4"; 115 115 116 116 src = fetchzip { 117 117 url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; 118 - hash = "sha256-1ycMyER09PIN5JyT5nQxUe3GnaVC6WFUUiuug9aXyKc="; 118 + hash = "sha256-7UugWo3SzRap3Ed6NySRZOJgD+Wkb9J+QEGRUfLbOPI="; 119 119 }; 120 120 121 121 strictDeps = true;
+2 -2
pkgs/by-name/pr/proton-ge-bin/package.nix
··· 9 9 }: 10 10 stdenvNoCC.mkDerivation (finalAttrs: { 11 11 pname = "proton-ge-bin"; 12 - version = "GE-Proton10-4"; 12 + version = "GE-Proton10-7"; 13 13 14 14 src = fetchzip { 15 15 url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; 16 - hash = "sha256-Si/CQ2PINfhmsC+uW3iFBUoSczZdkqwCZ8FAFuipu68="; 16 + hash = "sha256-XlZVQ+xYgg1H1xAHBcXZmF5//7k6w9NNspXJ/1KhzX8="; 17 17 }; 18 18 19 19 dontUnpack = true;
+48 -48
pkgs/by-name/ps/ps3-disc-dumper/deps.json
··· 1 1 [ 2 2 { 3 3 "pname": "Avalonia", 4 - "version": "11.3.0", 5 - "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg=" 4 + "version": "11.3.1", 5 + "hash": "sha256-732wl4/JmvYFS26NLvPD7T/V3J3JZUDy6Xwj5p1TNyE=" 6 6 }, 7 7 { 8 8 "pname": "Avalonia.Angle.Windows.Natives", 9 - "version": "2.1.22045.20230930", 10 - "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" 9 + "version": "2.1.25547.20250602", 10 + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" 11 11 }, 12 12 { 13 13 "pname": "Avalonia.BuildServices", ··· 16 16 }, 17 17 { 18 18 "pname": "Avalonia.Desktop", 19 - "version": "11.3.0", 20 - "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I=" 19 + "version": "11.3.1", 20 + "hash": "sha256-H6SLCi3by9bFF1YR12PnNZSmtC44UQPKr+5+8LvqC90=" 21 21 }, 22 22 { 23 23 "pname": "Avalonia.Fonts.Inter", 24 - "version": "11.3.0", 25 - "hash": "sha256-/ObA3b0iPpPFcXBUiD8TmdCXFVqZKToK7YRuU3QUWtg=" 24 + "version": "11.3.1", 25 + "hash": "sha256-LfNYF+SywrIzUw4T+GRE/Mr8E7GQskQQTTfK3Kc5YVQ=" 26 26 }, 27 27 { 28 28 "pname": "Avalonia.FreeDesktop", 29 - "version": "11.3.0", 30 - "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4=" 29 + "version": "11.3.1", 30 + "hash": "sha256-Iph1SQazNNr9liox0LR7ITidAEEWhp8Mg9Zn4MZVkRQ=" 31 31 }, 32 32 { 33 33 "pname": "Avalonia.Native", 34 - "version": "11.3.0", 35 - "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs=" 34 + "version": "11.3.1", 35 + "hash": "sha256-jNzqmHm58bbPGs/ogp6gFvinbN81Psg+sg+Z5UsbcDs=" 36 36 }, 37 37 { 38 38 "pname": "Avalonia.Remote.Protocol", 39 - "version": "11.3.0", 40 - "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I=" 39 + "version": "11.3.1", 40 + "hash": "sha256-evkhJOxKjsR+jNLrXRcrhqjFdlrxYMMMRBJ6FK08vMM=" 41 41 }, 42 42 { 43 43 "pname": "Avalonia.Skia", 44 - "version": "11.3.0", 45 - "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc=" 44 + "version": "11.3.1", 45 + "hash": "sha256-zN09CcuSqtLcQrTCQOoPJrhLd4LioZqt/Qi4sDp/cJI=" 46 46 }, 47 47 { 48 48 "pname": "Avalonia.Themes.Fluent", 49 - "version": "11.3.0", 50 - "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk=" 49 + "version": "11.3.1", 50 + "hash": "sha256-PApWHwIoLzbzrnyXJQLVy85Rbxag7NFEKMXOs2iVVaA=" 51 51 }, 52 52 { 53 53 "pname": "Avalonia.Win32", 54 - "version": "11.3.0", 55 - "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE=" 54 + "version": "11.3.1", 55 + "hash": "sha256-w3+8luJByeIchiVQ0wsq0olDabX/DndigyBEuK8Ty04=" 56 56 }, 57 57 { 58 58 "pname": "Avalonia.X11", 59 - "version": "11.3.0", 60 - "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU=" 59 + "version": "11.3.1", 60 + "hash": "sha256-0iUFrDM+10T3OiOeGSEiqQ6EzEucQL3shZUNqOiqkyQ=" 61 61 }, 62 62 { 63 63 "pname": "CommunityToolkit.Mvvm", ··· 66 66 }, 67 67 { 68 68 "pname": "HarfBuzzSharp", 69 - "version": "7.3.0.3", 70 - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" 69 + "version": "8.3.1.1", 70 + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" 71 71 }, 72 72 { 73 73 "pname": "HarfBuzzSharp.NativeAssets.Linux", 74 - "version": "7.3.0.3", 75 - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" 74 + "version": "8.3.1.1", 75 + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" 76 76 }, 77 77 { 78 78 "pname": "HarfBuzzSharp.NativeAssets.macOS", 79 - "version": "7.3.0.3", 80 - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" 79 + "version": "8.3.1.1", 80 + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" 81 81 }, 82 82 { 83 83 "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", 84 - "version": "7.3.0.3", 85 - "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" 84 + "version": "8.3.1.1", 85 + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" 86 86 }, 87 87 { 88 88 "pname": "HarfBuzzSharp.NativeAssets.Win32", 89 - "version": "7.3.0.3", 90 - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" 89 + "version": "8.3.1.1", 90 + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" 91 91 }, 92 92 { 93 93 "pname": "LTRData.DiscUtils.Core", 94 - "version": "1.0.54", 95 - "hash": "sha256-6n68/HVei6xzPvjTxP8utmHWUYWQ8bA6j19LT7hxCHc=" 94 + "version": "1.0.57", 95 + "hash": "sha256-W3MWde/i+/AjEnVrddhcBiuyHmujVAxq+NpJudgoIpc=" 96 96 }, 97 97 { 98 98 "pname": "LTRData.DiscUtils.Iso9660", 99 - "version": "1.0.54", 100 - "hash": "sha256-pW2wKBlMeqNFHXI58p2yR9uEkf3B5MqhRNfIjDt2JYE=" 99 + "version": "1.0.57", 100 + "hash": "sha256-h1LEAyKcrLB/QY77HH2eLAPtdFQccVeycwkVPr7x9/U=" 101 101 }, 102 102 { 103 103 "pname": "LTRData.DiscUtils.OpticalDisk", 104 - "version": "1.0.54", 105 - "hash": "sha256-k8DJcb6m2aEFd2SWICAjsZ+8IK4bPX7UP/od3ddI2eY=" 104 + "version": "1.0.57", 105 + "hash": "sha256-SD26HhU4622oUBWU+iK2yTj025RQh+P8ZJybJsZyUSs=" 106 106 }, 107 107 { 108 108 "pname": "LTRData.DiscUtils.Streams", 109 - "version": "1.0.54", 110 - "hash": "sha256-e0QWGFOAYFMCp/FDi/0kQ8Rd1hF3oWZ3pwrQX9sCFZg=" 109 + "version": "1.0.57", 110 + "hash": "sha256-00o7vHJGU0yNzFp9FlKBH+gCHVie4VBcx2PnTdW5XZQ=" 111 111 }, 112 112 { 113 113 "pname": "LTRData.DiscUtils.Udf", 114 - "version": "1.0.54", 115 - "hash": "sha256-K9Fs4SzQjW+ESuvvVqr9+fTs1hvGv571WCRc2Nl5jfo=" 114 + "version": "1.0.57", 115 + "hash": "sha256-HHCfCaW7SUpOiYBXARnXeAq0yKfPLudVL8HwLrmhL0g=" 116 116 }, 117 117 { 118 118 "pname": "LTRData.Extensions", ··· 366 366 }, 367 367 { 368 368 "pname": "System.IO.Hashing", 369 - "version": "9.0.4", 370 - "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" 369 + "version": "9.0.6", 370 + "hash": "sha256-QhOlqpeQsqJ2Lly8xV0lzSaNBmkGPEgtyTe9xSvkyAw=" 371 371 }, 372 372 { 373 373 "pname": "System.IO.Pipelines", ··· 456 456 }, 457 457 { 458 458 "pname": "System.Text.Encoding.CodePages", 459 - "version": "9.0.4", 460 - "hash": "sha256-gW3nGw3ElYCYTEuYxZOk1oyHsj3wBenr6uwJGK0u+IQ=" 459 + "version": "9.0.5", 460 + "hash": "sha256-trMfhFwGMnM60+UUqud7gFLL2YF5pCdhleKSonkkd84=" 461 461 }, 462 462 { 463 463 "pname": "System.Threading", ··· 486 486 }, 487 487 { 488 488 "pname": "WmiLight", 489 - "version": "6.13.0", 490 - "hash": "sha256-dliebNR45yj1Gvyv4WE7dMnWcdHx94PLjBv3AWhdS5I=" 489 + "version": "6.14.0", 490 + "hash": "sha256-MmfXmWsLonyTKNXqmszFbvyaDjPexgH5UoCGI8h2JlA=" 491 491 } 492 492 ]
+2 -2
pkgs/by-name/ps/ps3-disc-dumper/package.nix
··· 10 10 11 11 buildDotnetModule rec { 12 12 pname = "ps3-disc-dumper"; 13 - version = "4.3.6"; 13 + version = "4.3.9"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "13xforever"; 17 17 repo = "ps3-disc-dumper"; 18 18 tag = "v${version}"; 19 - hash = "sha256-dHd5pAWvol4TQBXcbb1E71TTxEWvLogvj0K4VL9huNs="; 19 + hash = "sha256-F+FyCuxzg7oTF2iRxWygXeGnspHrZ3Za8HhCSKNgoR4="; 20 20 }; 21 21 22 22 dotnet-sdk = dotnetCorePackages.sdk_9_0;
+3 -3
pkgs/by-name/sh/sheldon/package.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "sheldon"; 14 - version = "0.8.2"; 14 + version = "0.8.3"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "rossmacarthur"; 18 18 repo = "sheldon"; 19 19 rev = version; 20 - hash = "sha256-4tI/D9Z5+BAH7K9mA/sU/qPKWcPvZqpY5v4dDA0qfr0="; 20 + hash = "sha256-+NtiscyNlrXNNj3njvdZQB8dHs/PBYpEo9VwodEOtDs="; 21 21 }; 22 22 23 23 useFetchCargoVendor = true; 24 - cargoHash = "sha256-MHQbCsZng7YRvY5K+l9u90M/zyyfz2nl01RN46EUSXk="; 24 + cargoHash = "sha256-O9v77mwOeTnT4LetcrzQjdd3MDXDbpptUODMAVBwZv8="; 25 25 26 26 buildInputs = 27 27 [ openssl ]
+3 -3
pkgs/by-name/sh/shopware-cli/package.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "shopware-cli"; 13 - version = "0.6.10"; 13 + version = "0.6.16"; 14 14 src = fetchFromGitHub { 15 15 repo = "shopware-cli"; 16 16 owner = "FriendsOfShopware"; 17 17 tag = version; 18 - hash = "sha256-kzf54rPac/OYmmqEAoQPWFjtzMj0FOGOMoxdX2zlX8s="; 18 + hash = "sha256-oEWJ51XeAOE92u6U2Cjj875mn47R8IRbZ2BHy1zLblw="; 19 19 }; 20 20 21 21 nativeBuildInputs = [ ··· 27 27 dart-sass 28 28 ]; 29 29 30 - vendorHash = "sha256-gw0O9cLRkCo8FMlUSgVsL7c5xSSP7sAcwL/WUAy6MiI="; 30 + vendorHash = "sha256-am8tGpevz5KXX+8ckhlNVtoUbG3g739O9KP6rLsF0y8="; 31 31 32 32 postInstall = '' 33 33 installShellCompletion --cmd shopware-cli \
+2 -2
pkgs/by-name/si/signaturepdf/package.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "signaturepdf"; 16 - version = "1.7.4"; 16 + version = "1.8.0"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "24eme"; 20 20 repo = "signaturepdf"; 21 21 rev = "v${version}"; 22 - hash = "sha256-8R1eowMpdb4oj3j+gMJ2RsWVzHvNiXPwFaLHR0jqFJo="; 22 + hash = "sha256-Sk59yHnLSmO/Dd+cAntiAXzYyo6Rsp779Q+SszonbMc="; 23 23 }; 24 24 25 25 nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/by-name/sl/slepc/package.nix
··· 16 16 assert pythonSupport -> petsc.pythonSupport; 17 17 stdenv.mkDerivation (finalAttrs: { 18 18 pname = "slepc"; 19 - version = "3.23.1"; 19 + version = "3.23.2"; 20 20 21 21 src = fetchFromGitLab { 22 22 owner = "slepc"; 23 23 repo = "slepc"; 24 24 tag = "v${finalAttrs.version}"; 25 - hash = "sha256-K38/QH4AG8/SksrRLc+jIs1WO8FKFFTNkuHFbBER/tg="; 25 + hash = "sha256-nRY8ARc31Q2Qi8Tf7921vBf5nPpI4evSjmpTYUTUigQ="; 26 26 }; 27 27 28 28 postPatch = ''
+3 -3
pkgs/by-name/su/sudo-rs/package.nix
··· 13 13 14 14 rustPlatform.buildRustPackage (finalAttrs: { 15 15 pname = "sudo-rs"; 16 - version = "0.2.6"; 16 + version = "0.2.7"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "trifectatechfoundation"; 20 20 repo = "sudo-rs"; 21 21 tag = "v${finalAttrs.version}"; 22 - hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw="; 22 + hash = "sha256-02ODKMumYUKcmSfPAiCwpRph5+Zy+g5uqqbJ9ThRxRg="; 23 23 }; 24 24 useFetchCargoVendor = true; 25 - cargoHash = "sha256-/CbU2ds2VQ2IXx7GKxRO3vePzLXJXabA1FcyIGPsngw="; 25 + cargoHash = "sha256-o3//zJxB6CNHQl1DtfmFnSBP9npC4I9/hRuzpWrKoNs="; 26 26 27 27 nativeBuildInputs = [ 28 28 installShellFiles
+3 -3
pkgs/by-name/tl/tlsinfo/package.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "tlsinfo"; 10 - version = "0.1.47"; 10 + version = "0.1.48"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "paepckehh"; 14 14 repo = "tlsinfo"; 15 15 tag = "v${version}"; 16 - hash = "sha256-9YOFsUDNxZi1C59ZSQ31QXE9comFa6DGEzvRah0bruY="; 16 + hash = "sha256-1483Y1SoAVsXIjpa1CbOvVQsOol6adoQD9PCxHgSgU4="; 17 17 }; 18 18 19 - vendorHash = "sha256-f7Rkpz6qGiJNhxlYPJo2G3ykItj+55PvGnNPNOU1ftI="; 19 + vendorHash = "sha256-wHCHj7/DBzW0m16aXdQBjPRKjIlf2iab1345ud+ulVQ="; 20 20 21 21 ldflags = [ 22 22 "-s"
+2 -2
pkgs/by-name/ts/tscli/package.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "tscli"; 11 - version = "0.0.8"; 11 + version = "0.0.9"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "jaxxstorm"; 15 15 repo = "tscli"; 16 16 tag = "v${version}"; 17 - hash = "sha256-DlWUJukc4XSZCPtmcUwr5V7Wkn9WoG+tSHdH3YvYLaA="; 17 + hash = "sha256-GJkFiofMO9dMFDqISzp/ewH5hxpp04o/dXJ/XNUZk74="; 18 18 }; 19 19 20 20 vendorHash = "sha256-a/1I1enzmtVY/js7w/cCLTts8lGmMKMiCowH0Hr+xdM=";
+2 -2
pkgs/by-name/uw/uwsm/package.nix
··· 28 28 in 29 29 stdenv.mkDerivation (finalAttrs: { 30 30 pname = "uwsm"; 31 - version = "0.22.0"; 31 + version = "0.23.0"; 32 32 33 33 src = fetchFromGitHub { 34 34 owner = "Vladimir-csp"; 35 35 repo = "uwsm"; 36 36 tag = "v${finalAttrs.version}"; 37 - hash = "sha256-8MdgtfmgWVUl5YPP/91KrGNNHl60P2ID2TUMZ4V3BiI="; 37 + hash = "sha256-VQhU88JvL7O2MP41JVuBdieIopmqrNiAWacGWvsNhSc="; 38 38 }; 39 39 40 40 nativeBuildInputs = [
+3 -3
pkgs/by-name/ve/vector/package.nix
··· 25 25 26 26 let 27 27 pname = "vector"; 28 - version = "0.47.0"; 28 + version = "0.48.0"; 29 29 in 30 30 rustPlatform.buildRustPackage { 31 31 inherit pname version; ··· 34 34 owner = "vectordotdev"; 35 35 repo = "vector"; 36 36 rev = "v${version}"; 37 - hash = "sha256-09CjhSckptXbbTzBneo5aQ76YwLPSacRlsMpexsw54c="; 37 + hash = "sha256-qgf3aMZc1cgPlsAzgtaXLUx99KwN5no1amdkwFVyl4Y="; 38 38 }; 39 39 40 - cargoHash = "sha256-9cCqdi65C4JCMP743nhrNmBlJsIFiNPGguyVEEJpGww="; 40 + cargoHash = "sha256-t8mfZpLrzrxj1WUpJPqZWyfBf9XobcqZY/hAeVGzhcM="; 41 41 42 42 nativeBuildInputs = 43 43 [
+2 -2
pkgs/by-name/za/zashboard/package.nix
··· 9 9 10 10 stdenv.mkDerivation (finalAttrs: { 11 11 pname = "zashboard"; 12 - version = "1.94.2"; 12 + version = "1.96.0"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "Zephyruso"; 16 16 repo = "zashboard"; 17 17 tag = "v${finalAttrs.version}"; 18 - hash = "sha256-bG4fa6lsOsHYly6ORDx9WzUjgW5liY8hgUblYicbXXY="; 18 + hash = "sha256-3sY3C4iNqVPhbwWCzGRRJ9pDfewPq7q70kMrXuqZQpc="; 19 19 }; 20 20 21 21 nativeBuildInputs = [
+2 -2
pkgs/development/ocaml-modules/pcre/default.nix
··· 8 8 9 9 buildDunePackage rec { 10 10 pname = "pcre"; 11 - version = "8.0.3"; 11 + version = "8.0.4"; 12 12 13 13 useDune2 = true; 14 14 ··· 16 16 17 17 src = fetchurl { 18 18 url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz"; 19 - sha256 = "sha256-FIgCeBEAHKz7/6bNsUoqbH2c3eMq62gphVdEa+kNf3k="; 19 + sha256 = "sha256-CIoy3Co4YnVZ5AkEjkUarqV0u08ZAqU0IQsaL1SnuCA="; 20 20 }; 21 21 22 22 buildInputs = [ dune-configurator ];
+70
pkgs/development/python-modules/fast-array-utils/default.nix
··· 1 + { 2 + buildPythonPackage, 3 + dask, 4 + fetchFromGitHub, 5 + hatch-docstring-description, 6 + hatch-fancy-pypi-readme, 7 + hatch-min-requirements, 8 + hatch-vcs, 9 + hatchling, 10 + lib, 11 + numba, 12 + numpy, 13 + pytest-codspeed, 14 + pytest-doctestplus, 15 + pytestCheckHook, 16 + scipy, 17 + }: 18 + 19 + buildPythonPackage rec { 20 + pname = "fast-array-utils"; 21 + version = "1.2.1"; 22 + pyproject = true; 23 + 24 + src = fetchFromGitHub { 25 + owner = "scverse"; 26 + repo = "fast-array-utils"; 27 + tag = "v${version}"; 28 + hash = "sha256-SQaumXgjFn2+/MqllEs0zRnl2t7m2JZyOd+39vZPU2U="; 29 + }; 30 + 31 + # hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables. 32 + env.MIN_REQS_OFFLINE = "1"; 33 + 34 + build-system = [ 35 + hatch-docstring-description 36 + hatch-fancy-pypi-readme 37 + hatch-min-requirements 38 + hatch-vcs 39 + hatchling 40 + ]; 41 + 42 + dependencies = [ 43 + numpy 44 + ]; 45 + 46 + nativeCheckInputs = [ 47 + dask 48 + numba 49 + pytest-codspeed 50 + pytest-doctestplus 51 + pytestCheckHook 52 + scipy 53 + ]; 54 + 55 + pythonImportsCheck = [ 56 + "fast_array_utils.conv" 57 + "fast_array_utils.types" 58 + "fast_array_utils.typing" 59 + "fast_array_utils" 60 + ]; 61 + 62 + meta = { 63 + description = "Fast array utilities"; 64 + homepage = "https://icb-fast-array-utils.readthedocs-hosted.com"; 65 + license = lib.licenses.mpl20; 66 + maintainers = with lib.maintainers; [ 67 + samuela 68 + ]; 69 + }; 70 + }
+45
pkgs/development/python-modules/hatch-docstring-description/default.nix
··· 1 + { 2 + buildPythonPackage, 3 + fetchFromGitHub, 4 + hatch-vcs, 5 + hatchling, 6 + lib, 7 + pytestCheckHook, 8 + }: 9 + 10 + buildPythonPackage rec { 11 + pname = "hatch-docstring-description"; 12 + version = "1.1.1"; 13 + pyproject = true; 14 + 15 + src = fetchFromGitHub { 16 + owner = "flying-sheep"; 17 + repo = "hatch-docstring-description"; 18 + tag = "v${version}"; 19 + hash = "sha256-ouor0FV3qdXYJx5EWFUWSKp8Cc/EuD1WXrtLvbYG+XI="; 20 + }; 21 + 22 + build-system = [ 23 + hatchling 24 + hatch-vcs 25 + ]; 26 + 27 + nativeCheckInputs = [ pytestCheckHook ]; 28 + 29 + disabledTests = [ 30 + # See https://github.com/flying-sheep/hatch-docstring-description/issues/107 31 + "test_e2e[.]" 32 + "test_e2e[src]" 33 + ]; 34 + 35 + pythonImportsCheck = [ "hatch_docstring_description" ]; 36 + 37 + meta = { 38 + description = "Derive PyPI package description from Python package docstring"; 39 + homepage = "https://github.com/flying-sheep/hatch-docstring-description"; 40 + license = lib.licenses.gpl3; 41 + maintainers = with lib.maintainers; [ 42 + samuela 43 + ]; 44 + }; 45 + }
+39
pkgs/development/python-modules/hatch-min-requirements/default.nix
··· 1 + { 2 + buildPythonPackage, 3 + fetchFromGitHub, 4 + hatch-vcs, 5 + hatchling, 6 + lib, 7 + }: 8 + 9 + buildPythonPackage rec { 10 + pname = "hatch-min-requirements"; 11 + version = "0.1.0"; 12 + pyproject = true; 13 + 14 + src = fetchFromGitHub { 15 + owner = "tlambert03"; 16 + repo = "hatch-min-requirements"; 17 + tag = "v${version}"; 18 + hash = "sha256-7/6Es0DHDJ8jZ76kVbWkQjWFd8hWuB+PwCbOmIjzK5o="; 19 + }; 20 + 21 + build-system = [ 22 + hatchling 23 + hatch-vcs 24 + ]; 25 + 26 + # As of v0.1.0 all tests attempt to use the network 27 + doCheck = false; 28 + 29 + pythonImportsCheck = [ "hatch_min_requirements" ]; 30 + 31 + meta = { 32 + description = "Hatchling plugin to create optional-dependencies pinned to minimum versions"; 33 + homepage = "https://github.com/tlambert03/hatch-min-requirements"; 34 + license = lib.licenses.bsd3; 35 + maintainers = with lib.maintainers; [ 36 + samuela 37 + ]; 38 + }; 39 + }
+2 -2
pkgs/development/python-modules/orbax-checkpoint/default.nix
··· 35 35 36 36 buildPythonPackage rec { 37 37 pname = "orbax-checkpoint"; 38 - version = "0.11.16"; 38 + version = "0.11.18"; 39 39 pyproject = true; 40 40 41 41 src = fetchFromGitHub { 42 42 owner = "google"; 43 43 repo = "orbax"; 44 44 tag = "v${version}"; 45 - hash = "sha256-C5glSasB4LtxcaDx8U5rn7Y5J39+ieP0Mh2ITE1y1k8="; 45 + hash = "sha256-Uosd2TfC3KJMp46SnNnodPBc+G1nNdqFOwPQA+aVyrQ="; 46 46 }; 47 47 48 48 sourceRoot = "${src.name}/checkpoint";
+12 -3
pkgs/development/python-modules/wandb/default.nix
··· 285 285 286 286 # broke somewhere between sentry-sdk 2.15.0 and 2.22.0 287 287 "tests/unit_tests/test_analytics/test_sentry.py" 288 + 289 + # Server connection times out under load 290 + "tests/unit_tests/test_wandb_login.py" 291 + 292 + # PermissionError: unable to write to .cache/wandb/artifacts 293 + "tests/unit_tests/test_artifacts/test_wandb_artifacts.py" 288 294 ]; 289 295 290 296 disabledTests = ··· 359 365 "test_log_media_prefixed_with_multiple_slashes" 360 366 "test_log_media_saves_to_run_directory" 361 367 "test_log_media_with_path_traversal" 368 + 369 + # HandleAbandonedError / SystemExit when run in sandbox 370 + "test_makedirs_raises_oserror__uses_temp_dir" 371 + 372 + # AssertionError: Not all requests have been executed 373 + "test_image_refs" 362 374 ] 363 375 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 364 376 # AssertionError: assert not copy2_mock.called ··· 378 390 379 391 # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1] 380 392 "test_wandb_image_with_matplotlib_figure" 381 - 382 - # HandleAbandonedError / SystemExit when run in sandbox 383 - "test_makedirs_raises_oserror__uses_temp_dir" 384 393 ]; 385 394 386 395 pythonImportsCheck = [ "wandb" ];
+2 -2
pkgs/shells/fish/plugins/forgit.nix
··· 6 6 7 7 buildFishPlugin rec { 8 8 pname = "forgit"; 9 - version = "25.06.0"; 9 + version = "25.07.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "wfxr"; 13 13 repo = "forgit"; 14 14 rev = version; 15 - hash = "sha256-D1we3pOPXNsK8KgEaRBAmD5eH1i2ud4zX1GwYbOyZvY="; 15 + hash = "sha256-h9li2nwKG6SnOQntWZpdeBbU3RrwO4+4yO7tAwuOwhE="; 16 16 }; 17 17 18 18 postInstall = ''
+10 -10
pkgs/tools/admin/pgadmin/default.nix
··· 6 6 nixosTests, 7 7 postgresqlTestHook, 8 8 postgresql, 9 - yarn-berry_3, 9 + yarn-berry_4, 10 10 nodejs, 11 11 autoconf, 12 12 automake, ··· 22 22 23 23 let 24 24 pname = "pgadmin"; 25 - version = "9.4"; 26 - yarnHash = "sha256-AlAyHtadjmKZb0rHNIlaPtEcGFQ15Fc6rExMsNFGwDc="; 25 + version = "9.5"; 26 + yarnHash = "sha256-i3WCEpcZepB7K0A4QgjoLfkO7icew/8usJCo4DkWT6I="; 27 27 28 28 src = fetchFromGitHub { 29 29 owner = "pgadmin-org"; 30 30 repo = "pgadmin4"; 31 31 rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; 32 - hash = "sha256-oslp9g63mYeP9CmpCzF80nlyqF1ftGbMRIsp6goJOx4="; 32 + hash = "sha256-5FwYkdhpg/2Cidi2qiFhhsQYbIwsp80K3MNxw5rp4ww="; 33 33 }; 34 34 35 35 mozjpeg-bin = fetchFromGitHub { ··· 59 59 pythonPackages.buildPythonApplication rec { 60 60 inherit pname version src; 61 61 62 - offlineCache = yarn-berry_3.fetchYarnBerryDeps { 62 + offlineCache = yarn-berry_4.fetchYarnBerryDeps { 63 63 # mozjpeg fails to build on darwin due to a hardocded path 64 64 # this has been fixed upstream on master but no new version 65 65 # has been released. We therefore point yarn to upstream ··· 154 154 export LD=$CC 155 155 export HOME=$(mktemp -d) 156 156 export YARN_ENABLE_SCRIPTS=1 157 - YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableTelemetry false 158 - YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableGlobalCache false 157 + YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableTelemetry false 158 + YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableGlobalCache false 159 159 export npm_config_nodedir="${srcOnly nodejs}" 160 160 export npm_config_node_gyp="${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" 161 - YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn install --inline-builds 161 + YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn install --inline-builds 162 162 ) 163 163 yarn webpacker 164 164 cp -r * ../pip-build/pgadmin4 ··· 185 185 cython 186 186 pip 187 187 sphinx 188 - yarn-berry_3 189 - yarn-berry_3.yarnBerryConfigHook 188 + yarn-berry_4 189 + yarn-berry_4.yarnBerryConfigHook 190 190 nodejs 191 191 192 192 # for building mozjpeg2
+20 -21
pkgs/tools/admin/pgadmin/mozjpeg.patch
··· 1 1 diff --git a/yarn.lock b/yarn.lock 2 - index fa189ef..54066a6 100644 2 + index 8bfff31..0f12f87 100644 3 3 --- a/yarn.lock 4 4 +++ b/yarn.lock 5 - @@ -7299,6 +7299,23 @@ __metadata: 5 + @@ -7347,6 +7347,23 @@ __metadata: 6 6 languageName: node 7 7 linkType: hard 8 - 8 + 9 9 +"execa@npm:^7.1.1": 10 10 + version: 7.1.1 11 11 + resolution: "execa@npm:7.1.1" 12 12 + dependencies: 13 - + cross-spawn: ^7.0.3 14 - + get-stream: ^6.0.1 15 - + human-signals: ^3.0.1 16 - + is-stream: ^3.0.0 17 - + merge-stream: ^2.0.0 18 - + npm-run-path: ^5.1.0 19 - + onetime: ^6.0.0 20 - + signal-exit: ^3.0.7 21 - + strip-final-newline: ^3.0.0 22 - + checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937 13 + + cross-spawn: "npm:^7.0.3" 14 + + get-stream: "npm:^6.0.1" 15 + + human-signals: "npm:^3.0.1" 16 + + is-stream: "npm:^3.0.0" 17 + + merge-stream: "npm:^2.0.0" 18 + + npm-run-path: "npm:^5.1.0" 19 + + onetime: "npm:^6.0.0" 20 + + signal-exit: "npm:^3.0.7" 21 + + strip-final-newline: "npm:^3.0.0" 22 + + checksum: 0da5ee1c895b62142bc3d1567d1974711c28c2cfa6bae96e1923379bd597e476d762a13f282f92815d8ebfa33407949634fa32a0d6db8334a20e625fe11d4351 23 23 + languageName: node 24 24 + linkType: hard 25 25 + 26 26 "executable@npm:^4.1.0": 27 27 version: 4.1.1 28 28 resolution: "executable@npm:4.1.1" 29 - @@ -11027,13 +11044,14 @@ __metadata: 30 - 29 + @@ -11120,13 +11137,14 @@ __metadata: 30 + 31 31 "mozjpeg@npm:^8.0.0": 32 32 version: 8.0.0 33 33 - resolution: "mozjpeg@npm:8.0.0" 34 34 + resolution: "mozjpeg@https://github.com/imagemin/mozjpeg-bin.git#commit=c0587fbc00b21ed8cad8bae499a0827baeaf7ffa" 35 35 dependencies: 36 - bin-build: ^3.0.0 37 - bin-wrapper: ^4.0.0 38 - + execa: ^7.1.1 36 + bin-build: "npm:^3.0.0" 37 + bin-wrapper: "npm:^4.0.0" 38 + + execa: "npm:^7.1.1" 39 39 bin: 40 40 mozjpeg: cli.js 41 - - checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb557 41 + - checksum: 10c0/e91294c15bb31dcaa5eb0780e772214052aa8cb1efc35f74a5c4fe85c9af9d3d6e2f3dc64d3379a86a63b5cbc86a2618c23e350c9131e55ac76726647537b7e8 42 42 + checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb556 43 43 languageName: node 44 - linkType: hard 45 - 44 + linkType: hard
+1 -1
pkgs/tools/admin/pgadmin/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_3 yarn-berry_3.yarn-berry-fetcher 2 + #!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_4 yarn-berry_4.yarn-berry-fetcher 3 3 4 4 set -eu -o pipefail 5 5
+14
pkgs/tools/typesetting/tex/texlive/bin.nix
··· 389 389 url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1009196;filename=lua_fixed_hash.patch;msg=45"; 390 390 sha256 = "sha256-FTu1eRd3AUU7IRs2/7e7uwHuvZsrzTBPypbcEZkU7y4="; 391 391 }) 392 + # The original LuaJIT version number used here is 2.1.1736781742. 393 + # The patch number in this is the unix epoch timestamp of the commit used. 394 + # TexLive already truncates the patch number to the last 5 digits (81742 395 + # in this case), however, this number will roll over every 1.1 days (1e5 396 + # seconds), making it non-monotonic. 397 + # Furthermore, the nix-darwin linker requires version numbers to be <= 398 + # 1023. 399 + # We therefore opt to choose a 3-digit sequence from the unix epoch that 400 + # gives a good tradeoff between when it will roll over, and how often it 401 + # will actually change: digits 9-7 (counting from the right, i.e., 736 in 402 + # this case) yields a number that changes every 11.6 days (1e6 seconds, 403 + # it is unlikely texlive will be updated on a shorter interval), and will 404 + # stay stable for 31.7 years (1e9 seconds). 405 + ./truncate-luajit-version-number.patch 392 406 ]; 393 407 394 408 hardeningDisable = [ "format" ];
+209
pkgs/tools/typesetting/tex/texlive/truncate-luajit-version-number.patch
··· 1 + From 2da802031f7b7f2c9f5327b5155af9aec0d02686 Mon Sep 17 00:00:00 2001 2 + From: Christoph Jabs <contact@christophjabs.info> 3 + Date: Tue, 1 Jul 2025 13:05:54 +0300 4 + Subject: [PATCH] truncate luajit version number 5 + 6 + --- 7 + libs/luajit/configure | 24 ++++++++++++------------ 8 + libs/luajit/native/configure | 20 ++++++++++---------- 9 + libs/luajit/version.ac | 2 +- 10 + 3 files changed, 23 insertions(+), 23 deletions(-) 11 + 12 + diff --git a/libs/luajit/configure b/libs/luajit/configure 13 + index c1bc09c039..2ba3598fb8 100755 14 + --- a/libs/luajit/configure 15 + +++ b/libs/luajit/configure 16 + @@ -1,6 +1,6 @@ 17 + #! /bin/sh 18 + # Guess values for system-dependent variables and create Makefiles. 19 + -# Generated by GNU Autoconf 2.72 for luajit for TeX Live 2.1.81742. 20 + +# Generated by GNU Autoconf 2.72 for luajit for TeX Live 2.1.736. 21 + # 22 + # Report bugs to <tex-k@tug.org>. 23 + # 24 + @@ -614,8 +614,8 @@ MAKEFLAGS= 25 + # Identity of this package. 26 + PACKAGE_NAME='luajit for TeX Live' 27 + PACKAGE_TARNAME='luajit-for-tex-live' 28 + -PACKAGE_VERSION='2.1.81742' 29 + -PACKAGE_STRING='luajit for TeX Live 2.1.81742' 30 + +PACKAGE_VERSION='2.1.736' 31 + +PACKAGE_STRING='luajit for TeX Live 2.1.736' 32 + PACKAGE_BUGREPORT='tex-k@tug.org' 33 + PACKAGE_URL='' 34 + 35 + @@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then 36 + # Omit some internal or obsolete options to make the list less imposing. 37 + # This message is too long to be a string in the A/UX 3.1 sh. 38 + cat <<_ACEOF 39 + -'configure' configures luajit for TeX Live 2.1.81742 to adapt to many kinds of systems. 40 + +'configure' configures luajit for TeX Live 2.1.736 to adapt to many kinds of systems. 41 + 42 + Usage: $0 [OPTION]... [VAR=VALUE]... 43 + 44 + @@ -1457,7 +1457,7 @@ fi 45 + 46 + if test -n "$ac_init_help"; then 47 + case $ac_init_help in 48 + - short | recursive ) echo "Configuration of luajit for TeX Live 2.1.81742:";; 49 + + short | recursive ) echo "Configuration of luajit for TeX Live 2.1.736:";; 50 + esac 51 + cat <<\_ACEOF 52 + 53 + @@ -1578,7 +1578,7 @@ fi 54 + test -n "$ac_init_help" && exit $ac_status 55 + if $ac_init_version; then 56 + cat <<\_ACEOF 57 + -luajit for TeX Live configure 2.1.81742 58 + +luajit for TeX Live configure 2.1.736 59 + generated by GNU Autoconf 2.72 60 + 61 + Copyright (C) 2023 Free Software Foundation, Inc. 62 + @@ -2134,7 +2134,7 @@ cat >config.log <<_ACEOF 63 + This file contains any messages produced by compilers while 64 + running configure, to aid debugging if configure makes a mistake. 65 + 66 + -It was created by luajit for TeX Live $as_me 2.1.81742, which was 67 + +It was created by luajit for TeX Live $as_me 2.1.736, which was 68 + generated by GNU Autoconf 2.72. Invocation command line was 69 + 70 + $ $0$ac_configure_args_raw 71 + @@ -5102,7 +5102,7 @@ fi 72 + 73 + # Define the identity of the package. 74 + PACKAGE='luajit-for-tex-live' 75 + - VERSION='2.1.81742' 76 + + VERSION='2.1.736' 77 + 78 + 79 + printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h 80 + @@ -6703,10 +6703,10 @@ printf "%s\n" "no, using $LN_S" >&6; } 81 + fi 82 + 83 + 84 + -LUAJITVERSION=2.1.81742 85 + +LUAJITVERSION=2.1.736 86 + 87 + 88 + -LUAJIT_LT_VERSINFO=3:81742:1 89 + +LUAJIT_LT_VERSINFO=3:736:1 90 + 91 + 92 + case `pwd` in 93 + @@ -17377,7 +17377,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 94 + # report actual input values of CONFIG_FILES etc. instead of their 95 + # values after options handling. 96 + ac_log=" 97 + -This file was extended by luajit for TeX Live $as_me 2.1.81742, which was 98 + +This file was extended by luajit for TeX Live $as_me 2.1.736, which was 99 + generated by GNU Autoconf 2.72. Invocation command line was 100 + 101 + CONFIG_FILES = $CONFIG_FILES 102 + @@ -17445,7 +17445,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ 103 + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 104 + ac_cs_config='$ac_cs_config_escaped' 105 + ac_cs_version="\\ 106 + -luajit for TeX Live config.status 2.1.81742 107 + +luajit for TeX Live config.status 2.1.736 108 + configured by $0, generated by GNU Autoconf 2.72, 109 + with options \\"\$ac_cs_config\\" 110 + 111 + diff --git a/libs/luajit/native/configure b/libs/luajit/native/configure 112 + index 23c4d29bf0..8f9c93f8ff 100755 113 + --- a/libs/luajit/native/configure 114 + +++ b/libs/luajit/native/configure 115 + @@ -1,6 +1,6 @@ 116 + #! /bin/sh 117 + # Guess values for system-dependent variables and create Makefiles. 118 + -# Generated by GNU Autoconf 2.72 for luajit native 2.1.81742. 119 + +# Generated by GNU Autoconf 2.72 for luajit native 2.1.736. 120 + # 121 + # Report bugs to <tex-k@tug.org>. 122 + # 123 + @@ -604,8 +604,8 @@ MAKEFLAGS= 124 + # Identity of this package. 125 + PACKAGE_NAME='luajit native' 126 + PACKAGE_TARNAME='luajit-native' 127 + -PACKAGE_VERSION='2.1.81742' 128 + -PACKAGE_STRING='luajit native 2.1.81742' 129 + +PACKAGE_VERSION='2.1.736' 130 + +PACKAGE_STRING='luajit native 2.1.736' 131 + PACKAGE_BUGREPORT='tex-k@tug.org' 132 + PACKAGE_URL='' 133 + 134 + @@ -1316,7 +1316,7 @@ if test "$ac_init_help" = "long"; then 135 + # Omit some internal or obsolete options to make the list less imposing. 136 + # This message is too long to be a string in the A/UX 3.1 sh. 137 + cat <<_ACEOF 138 + -'configure' configures luajit native 2.1.81742 to adapt to many kinds of systems. 139 + +'configure' configures luajit native 2.1.736 to adapt to many kinds of systems. 140 + 141 + Usage: $0 [OPTION]... [VAR=VALUE]... 142 + 143 + @@ -1387,7 +1387,7 @@ fi 144 + 145 + if test -n "$ac_init_help"; then 146 + case $ac_init_help in 147 + - short | recursive ) echo "Configuration of luajit native 2.1.81742:";; 148 + + short | recursive ) echo "Configuration of luajit native 2.1.736:";; 149 + esac 150 + cat <<\_ACEOF 151 + 152 + @@ -1484,7 +1484,7 @@ fi 153 + test -n "$ac_init_help" && exit $ac_status 154 + if $ac_init_version; then 155 + cat <<\_ACEOF 156 + -luajit native configure 2.1.81742 157 + +luajit native configure 2.1.736 158 + generated by GNU Autoconf 2.72 159 + 160 + Copyright (C) 2023 Free Software Foundation, Inc. 161 + @@ -1883,7 +1883,7 @@ cat >config.log <<_ACEOF 162 + This file contains any messages produced by compilers while 163 + running configure, to aid debugging if configure makes a mistake. 164 + 165 + -It was created by luajit native $as_me 2.1.81742, which was 166 + +It was created by luajit native $as_me 2.1.736, which was 167 + generated by GNU Autoconf 2.72. Invocation command line was 168 + 169 + $ $0$ac_configure_args_raw 170 + @@ -4851,7 +4851,7 @@ fi 171 + 172 + # Define the identity of the package. 173 + PACKAGE='luajit-native' 174 + - VERSION='2.1.81742' 175 + + VERSION='2.1.736' 176 + 177 + 178 + printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h 179 + @@ -6905,7 +6905,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 180 + # report actual input values of CONFIG_FILES etc. instead of their 181 + # values after options handling. 182 + ac_log=" 183 + -This file was extended by luajit native $as_me 2.1.81742, which was 184 + +This file was extended by luajit native $as_me 2.1.736, which was 185 + generated by GNU Autoconf 2.72. Invocation command line was 186 + 187 + CONFIG_FILES = $CONFIG_FILES 188 + @@ -6973,7 +6973,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ 189 + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 190 + ac_cs_config='$ac_cs_config_escaped' 191 + ac_cs_version="\\ 192 + -luajit native config.status 2.1.81742 193 + +luajit native config.status 2.1.736 194 + configured by $0, generated by GNU Autoconf 2.72, 195 + with options \\"\$ac_cs_config\\" 196 + 197 + diff --git a/libs/luajit/version.ac b/libs/luajit/version.ac 198 + index 4aac6497c1..534f508733 100644 199 + --- a/libs/luajit/version.ac 200 + +++ b/libs/luajit/version.ac 201 + @@ -11,4 +11,4 @@ dnl m4-include this file to define the current luajit version 202 + dnl m4_define([luajit_version], [2.1.1736781742]) 203 + dnl libtool: error: REVISION '1736781742' must be a nonnegative integer 204 + dnl libtool: error: '3:1736781742:1' is not valid version information 205 + -m4_define([luajit_version], [2.1.81742]) 206 + +m4_define([luajit_version], [2.1.736]) 207 + -- 208 + 2.49.0 209 +
+8
pkgs/top-level/python-packages.nix
··· 4884 4884 4885 4885 farama-notifications = callPackage ../development/python-modules/farama-notifications { }; 4886 4886 4887 + fast-array-utils = callPackage ../development/python-modules/fast-array-utils { }; 4888 + 4887 4889 fast-histogram = callPackage ../development/python-modules/fast-histogram { }; 4888 4890 4889 4891 fastai = callPackage ../development/python-modules/fastai { }; ··· 6359 6361 6360 6362 hatch-babel = callPackage ../development/python-modules/hatch-babel { }; 6361 6363 6364 + hatch-docstring-description = 6365 + callPackage ../development/python-modules/hatch-docstring-description 6366 + { }; 6367 + 6362 6368 hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { }; 6363 6369 6364 6370 hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { }; 6371 + 6372 + hatch-min-requirements = callPackage ../development/python-modules/hatch-min-requirements { }; 6365 6373 6366 6374 hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; 6367 6375